threads / bug / 1495

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

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

## tl;dr

2 messages between Aug 13, 2005 and Aug 15, 2005.

replies: 1people: 2as markdown or json

Brad Roberts· Aug 13, 2005, 10:42 UTC · lore

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

Johannes Schindelin· Aug 15, 2005, 23:02 UTC · re: Brad Roberts · lore

Hi,

On Sat, 13 Aug 2005, Brad Roberts wrote:

Show 8 quoted lines

> 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

That is exactly the same as with 10.2.8.

Show 5 quoted lines

> [...] 
> * FAIL 9: apply diff between 2 and 3
>         git-apply <diff.2-3 && diff frotz.3 frotz
> * FAIL 12: apply diff between 3 and 2
>         git-apply <diff.3-2 && diff frotz.2 frotz

Yes, that is what I saw, too. Actually, I found the bug in diff-v2.7 annoying enough that I updated (just diff) to version 2.8.1. That works fine.

Ciao, Dscho