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

From: Junio C Hamano <gitster@pobox•com>
To: Michael Blume <blume.mike@gmail•com>
Cc: Paul Tan <pyokagan@gmail•com>, Git List <git@vger•kernel.org>,
	Stefan Beller <sbeller@google•com>,
	Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH v3 1/9] t5520: fixup file contents comparisons
Date: Thu, 14 May 2015 10:44:51 -0700	[thread overview]
Message-ID: <xmqq4mnf8358.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAO2U3QgD0-tAwGnMeeMR5aqbUuqDsdWy0Sw8dQBPUpUNwJZpHg@mail.gmail.com> (Michael Blume's message of "Thu, 14 May 2015 10:29:34 -0700")

Michael Blume <blume.mike@gmail•com> writes:

> On Wed, May 13, 2015 at 7:42 AM, Junio C Hamano <gitster@pobox•com> wrote:
>> Junio C Hamano <gitster@pobox•com> writes:
>>
>>> Paul Tan <pyokagan@gmail•com> writes:
>>>
>>>> Replace the above 2 forms with:
>>>>
>>>>      verbose test "$(cat file)" = expected
>>>
>>> Quoting is very much a good idea, but I am not enthused by the
>>> vision of having to write verbose everywhere in our script.
>>> 
>>> After seeing a script fail, you can run it again with -i -x options;
>>> wouldn't it be sufficient?
>> ...
>
> My build starts breaking from this commit, I'm on a mac.
>
>
> expecting success:
>     (cd dst &&
>      test_must_fail git pull --rebase &&
>      verbose test 1 = "$(find .git/rebase-apply -name "000*" | wc -l)"
>     )
>
> First, rewinding head to replay your work on top of it...
> ...
> To check out the original branch and stop rebasing, run "git rebase --abort".
>
> command failed:  'test' '1' '=' '       1'
> not ok 33 - git pull --rebase does not reapply old patches

Change that 'verbose test' line to

	verbose test 1 = $(find .git/rebase-apply -name "000*" | wc -l)

i.e. losing the double-quotes around $().

By the way, thanks for a fine demonstration that the 'verbose test'
is not very useful.

This output

> command failed:  'test' '1' '=' '       1'

and that you said "on a mac", _I_ can immediately guess that there
is "wc -l" involved, because it has been a frequent source of
portability headache.

But "verbose" is not helping very much to show there is "wc -l";
unless the person debugging the output has a pretty good idea what
can go wrong, that is.

next prev parent reply	other threads:[~2015-05-14 17:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13  9:08 [PATCH v3 0/9] Improve git-pull test coverage Paul Tan
2015-05-13  9:08 ` [PATCH v3 1/9] t5520: fixup file contents comparisons Paul Tan
2015-05-13 14:01   ` Junio C Hamano
2015-05-13 14:42     ` Junio C Hamano
2015-05-14 17:29       ` Michael Blume
2015-05-14 17:44         ` Junio C Hamano [this message]
2015-05-15 11:41           ` Paul Tan
2015-05-15 18:37             ` Junio C Hamano
2015-05-15 19:22               ` Junio C Hamano
2015-05-16 13:49               ` Paul Tan
2015-05-16 18:57                 ` Junio C Hamano
2015-05-16 23:32                   ` Junio C Hamano
2015-05-17  7:47                   ` Paul Tan
2015-05-13  9:08 ` [PATCH v3 2/9] t5520: ensure origin refs are updated Paul Tan
2015-05-13 14:27   ` Junio C Hamano
2015-05-18 13:09     ` Paul Tan
2015-05-13  9:08 ` [PATCH v3 3/9] t5520: test no merge candidates cases Paul Tan
2015-05-13  9:08 ` [PATCH v3 4/9] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-13  9:32   ` Matthieu Moy
2015-05-15  8:25   ` Paul Tan
2015-05-13  9:08 ` [PATCH v3 5/9] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-13  9:08 ` [PATCH v3 6/9] t5520: test --rebase with multiple branches Paul Tan
2015-05-13  9:08 ` [PATCH v3 7/9] t5520: test --rebase failure on unborn branch with index Paul Tan
2015-05-13  9:08 ` [PATCH v3 8/9] t5521: test --dry-run does not make any changes Paul Tan
2015-05-13  9:08 ` [PATCH v3 9/9] t5520: check reflog action in fast-forward merge Paul Tan

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=xmqq4mnf8358.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=blume.mike@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=johannes.schindelin@gmx$(echo .)de \
    --cc=pyokagan@gmail$(echo .)com \
    --cc=sbeller@google$(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