On Wed, Sep 29, 2010 at 19:48, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Elijah Newren <newren@xxxxxxxxx> writes:
>
>> Acked-by: Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx>
>> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
>> ---
>> @@ -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
Or, as previously suggested:
test_might_fail unset VAR &&
Doesn't test_might_fail work for the unset build-in too?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html