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

Re: git reveals a bug in (some versions) BSD diff

From
BRBrad Roberts <braddr@puremagic.com>
Date
Aug 13, 2005, 10:42 UTC
Message-ID
<Pine.LNX.4.44.0508130335300.2136-100000@bellevue.puremagic.com>

I'm seeing this on a standard os/x 10.3.9 install which seems to have an old, but still GNU based, diff.

$ which diff /usr/bin/diff

$ diff --version diff - GNU diffutils version 2.7

$ sh ./t4101-apply-nonl.sh
*   ok 1: apply diff between 0 and 1
*   ok 2: apply diff between 0 and 2
*   ok 3: apply diff between 0 and 3
*   ok 4: apply diff between 1 and 0
*   ok 5: apply diff between 1 and 2
*   ok 6: apply diff between 1 and 3
*   ok 7: apply diff between 2 and 0
*   ok 8: apply diff between 2 and 1
* FAIL 9: apply diff between 2 and 3
        git-apply <diff.2-3 && diff frotz.3 frotz
*   ok 10: apply diff between 3 and 0
*   ok 11: apply diff between 3 and 1
* FAIL 12: apply diff between 3 and 2
        git-apply <diff.3-2 && diff frotz.2 frotz
* failed 2 among 12 test(s)

For what it's worth, this is the only test failing on this box (after the application of the TZ patch I just sent).

Later, Brad

Next: Johannes Schindelin
Message 1 of 2 in “Re: git reveals a bug in (some versions) BSD diff”
  1. Brad RobertsAug 13, 2005
  2. Johannes SchindelinAug 15, 2005

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.