Re: [PATCH 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 14, 2018, 04:55 UTC
- Message-ID
- <xmqqin10p8aq.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <948b3dc146fe353fbab6057c1376fa0e787a444f.1542030510.git.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de> > > It really makes very, very little sense to use a different git > executable than the one the caller indicated via setting the environment > variable GIT_TEST_INSTALLED.
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?
Show 20 quoted lines
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/test-lib-functions.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 78d8c3783b..801cc9b2ef 100644
> --- a/t/test-lib-functions.sh
> +++ b/t/test-lib-functions.sh
> @@ -900,7 +900,8 @@ test_create_repo () {
> mkdir -p "$repo"
> (
> cd "$repo" || error "Cannot setup test environment"
> - "$GIT_EXEC_PATH/git-init" "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
> + "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git" init \
> + "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
> error "cannot run git init -- have you built things yet?"
> mv .git/hooks .git/hooks-disabled
> ) || exit