From: Junio C Hamano <gitster@pobox.com>
To: Doug Kelly <dougk.ff7@gmail.com>
Cc: Eric Sunshine <sunshine@sunshineco.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] t4255: test am submodule with diff.submodule
Date: Mon, 29 Dec 2014 07:42:01 -0800 [thread overview]
Message-ID: <xmqqiogu1n06.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAPig+cT3gA2YpiT2Vr=F5-hB+Zy4ask-kz8DtpL3eFvz9PJb5Q@mail.gmail.com> (Eric Sunshine's message of "Sat, 27 Dec 2014 19:37:00 -0500")
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").
next prev parent reply other threads:[~2014-12-29 15:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-26 23:11 [PATCH 0/2] Fix issue with format-patch and diff.submodule Doug Kelly
2014-12-26 23:11 ` [PATCH 1/2] t4255: test am submodule with diff.submodule Doug Kelly
2014-12-28 0:37 ` Eric Sunshine
2014-12-28 1:00 ` Doug Kelly
2014-12-29 15:42 ` Junio C Hamano [this message]
2015-01-07 19:34 ` Doug Kelly
2015-01-07 20:20 ` Junio C Hamano
2014-12-26 23:11 ` [PATCH 2/2] format-patch: ignore diff.submodule setting Doug Kelly
2014-12-28 1:04 ` [PATCH v2 1/2] t4255: test am submodule with diff.submodule Doug Kelly
2014-12-28 1:04 ` [PATCH v2 2/2] format-patch: ignore diff.submodule setting Doug Kelly
2014-12-28 2:24 ` [PATCH v2 1/2] t4255: test am submodule with diff.submodule Eric Sunshine
2015-01-07 19:31 ` [PATCH v3 " Doug Kelly
2015-01-07 19:31 ` [PATCH v3 2/2] format-patch: ignore diff.submodule setting Doug Kelly
2015-01-07 20:06 ` [PATCH v3 1/2] t4255: test am submodule with diff.submodule Eric Sunshine
2015-01-07 20:13 ` [PATCH v4 " Doug Kelly
2015-01-07 20:13 ` [PATCH v4 2/2] format-patch: ignore diff.submodule setting Doug Kelly
2015-01-07 20:32 ` [PATCH v5 1/2] t4255: test am submodule with diff.submodule Doug Kelly
2015-01-07 20:32 ` [PATCH v5 2/2] format-patch: ignore diff.submodule setting Doug Kelly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqiogu1n06.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=dougk.ff7@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.