From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Dec 2014 15:42:01 GMT
Subject: Re: [PATCH 1/2] t4255: test am submodule with diff.submodule
Message-ID: <xmqqiogu1n06.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAPig+cT3gA2YpiT2Vr=F5-hB+Zy4ask-kz8DtpL3eFvz9PJb5Q@mail.gmail.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

>> +       (git am --abort || true) &&

Why (x || y)?  Is 'x' so unreliable that we do not know how should exit?
Should this be "test_must_fail git am --abort"?

>> +       (cd submodule && git rev-parse HEAD >../actual) &&

"git -C submodule rev-parse HEAD >actual" perhaps?

>> +test_expect_success 'diff.submodule unset' '
>> +       (git config --unset diff.submodule || true) &&

I think test_config and test_unconfig were invented for things like
this (same for all the other use of "git config").