git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?

From
Ramsay Jones <ramsay@ramsayjones.plus.com>
Date
Dec 31, 2015, 12:23 UTC
Message-ID
<56851E2E.4050403@ramsayjones.plus.com>
In-Reply-To
<CAPig+cQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT=9Q@mail.gmail.com>
On 31/12/15 06:08, Eric Sunshine wrote:
Show 8 quoted lines
> 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

Previous: Eric SunshineNext: Torsten Bögershausen
Message 3 of 4 in “./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?”
  1. Torsten BögershausenDec 30, 2015
  2. Eric SunshineDec 31, 2015
  3. Ramsay JonesDec 31, 2015
  4. Torsten BögershausenDec 31, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.