Re: [PATCH 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 15, 2018, 12:29 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1811151329150.41@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20181114213851.GA2960@sigill.intra.peff.net>
Hi Junio,
On Wed, 14 Nov 2018, Jeff King wrote:
Show 36 quoted lines
> On Wed, Nov 14, 2018 at 02:16:37PM +0100, Johannes Schindelin wrote: > > > > Makes perfect sense. Shouldn't we be asking where the template > > > directory of the installed version is and using it instead of the > > > freshly built one, no? > > > > It would make sense, but we don't know how to get that information, do we? > > > > $ git grep DEFAULT_GIT_TEMPLATE_DIR > > Makefile: -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' > > builtin/init-db.c:#ifndef DEFAULT_GIT_TEMPLATE_DIR > > builtin/init-db.c:#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates" > > builtin/init-db.c: template_dir = to_free = system_path(DEFAULT_GIT_TEMPLATE_DIR); > > contrib/vscode/init.sh: '-DDEFAULT_GIT_TEMPLATE_DIR="$(template_dir_SQ)"' \ > > > > In other words, the Makefile defines the DEFAULT_GIT_TEMPLATE_DIR, and the > > only user in the code is init-db.c which uses it in copy_templates(). > > > > And changing the code *now* to let us query Git where it thinks its > > templates should be won't work, as this patch is about using the installed > > Git (at whatever pre-compiled version that might be). > > Do we actually care where the templates are? I thought the point was to > override for the built Git to use the built templates instead of the > installed one. For an installed Git, shouldn't we not be overriding the > templates at all? I.e.: > > if test -n "$GIT_TEST_INSTALLED" > then > "$GIT_TEST_INSTALLED/git" init > else > "$GIT_ExEC_PATH/git" init --template="$GIT_BUILD_DIR/templates/blt" > fi >&3 2>&4 > > (That's all leaving aside the question of whether we ought to be using a > clean template dir instead of this).
I fear that that might buy us a ton of trouble. Just like we override the system config, we should override the templates.
Ciao, Dscho