Re: [PATCHv4 15/15] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 29, 2010, 19:48 UTC
- Message-ID
- <7viq1omiv8.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1285542879-16381-16-git-send-email-newren@gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 32 quoted lines
> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> @@ -175,8 +175,8 @@ test_expect_success 'init with init.templatedir set' '
> git config -f "$test_config" init.templatedir "${HOME}/templatedir-source" &&
> mkdir templatedir-set &&
> cd templatedir-set &&
> - unset GIT_CONFIG_NOGLOBAL &&
> - unset GIT_TEMPLATE_DIR &&
> + unset GIT_CONFIG_NOGLOBAL;
> + unset GIT_TEMPLATE_DIR;
> NO_SET_GIT_TEMPLATE_DIR=t &&
> export NO_SET_GIT_TEMPLATE_DIR &&
> git init
> @@ -187,7 +187,7 @@ test_expect_success 'init with init.templatedir set' '
> test_expect_success 'init --bare/--shared overrides system/global config' '
> (
> test_config="$HOME"/.gitconfig &&
> - unset GIT_CONFIG_NOGLOBAL &&
> + unset GIT_CONFIG_NOGLOBAL;
> git config -f "$test_config" core.bare false &&
> git config -f "$test_config" core.sharedRepository 0640 &&
> mkdir init-bare-shared-override &&
> @@ -202,7 +202,7 @@ test_expect_success 'init --bare/--shared overrides system/global config' '
> test_expect_success 'init honors global core.sharedRepository' '
> (
> test_config="$HOME"/.gitconfig &&
> - unset GIT_CONFIG_NOGLOBAL &&
> + unset GIT_CONFIG_NOGLOBAL;
> git config -f "$test_config" core.sharedRepository 0666 &&
> mkdir shared-honor-global &&
> cd shared-honor-global &&These three hunks look wrong as they break the && cascades. All others (including the change to 7502) look Ok.
Personally I do not agree that ";" at the end is explicit enough as t/README seems to think. If we want to be explicit, I'd say we should do so by saying something like:
unset VAR ;# can fail