public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

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: Wed, 07 Jan 2015 12:20:21 -0800	[thread overview]
Message-ID: <xmqq387mjqbe.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAEtYS8SiP8bU=82H+XxXZqa47hQ7hOAsZChCr94DwgPNft9L=g@mail.gmail.com> (Doug Kelly's message of "Wed, 7 Jan 2015 13:34:23 -0600")

Doug Kelly <dougk.ff7@gmail•com> writes:

> On Mon, Dec 29, 2014 at 9:42 AM, Junio C Hamano <gitster@pobox•com> wrote:
>> 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"?
>>
> Updated to test_might_fail -- we don't know if a merge is in progress or not.
> We still need to clean up, but disregard failure if a merge isn't in progress.

Ah, OK.  But even with "test_might_fail", it may not be clear why it
might fail, so it would be easier to maintain if we can read "we
don't know if a merge is in progress" next to the "test_might_fail".

For now we can add a comment, but in the longer term it might not be
a bad idea to change test_might_fail to require two args, one is a
command to run and the other is a text that explains why the outcome
is unknown.

Thanks for clarifying.

next prev parent reply	other threads:[~2015-01-07 20:20 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
2015-01-07 19:34       ` Doug Kelly
2015-01-07 20:20         ` Junio C Hamano [this message]
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=xmqq387mjqbe.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=dougk.ff7@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sunshine@sunshineco$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox