From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: "Eric Sunshine" <sunshine@sunshineco.com>,
"Torsten Bögershausen" <tboegi@web.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?
Date: Thu, 31 Dec 2015 12:23:10 +0000 [thread overview]
Message-ID: <56851E2E.4050403@ramsayjones.plus.com> (raw)
In-Reply-To: <CAPig+cQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT=9Q@mail.gmail.com>
On 31/12/15 06:08, Eric Sunshine wrote:
> On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen <tboegi@web.de> wrote:
>> I got 2 failures on pu under Mac OS, (Linux is OK)
>> I did some very basic debugging, it seems as if grep doesn't find
>> a needed string.
>> Does anybody have an idea here ?
>
> I'm unable to reproduce these failures on Mac.
>
This test failed during a short window (due to commit 2bd811ec) and
has already been fixed in commit 3a74ea38 ("notes: allow merging
from arbitrary references", 29-12-2015).
ATB,
Ramsay Jones
next prev parent reply other threads:[~2015-12-31 12:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-30 13:20 ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? Torsten Bögershausen
2015-12-31 6:08 ` Eric Sunshine
2015-12-31 12:23 ` Ramsay Jones [this message]
2015-12-31 15:47 ` ./t3310 fixed, t3400 broken Torsten Bögershausen
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=56851E2E.4050403@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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.