Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH] Deal with binary diff output from (unknown version of) diff

From: A Large Angry SCM <hidden>
Date: 2016-06-15 22:42:12

Passed here!


Junio C Hamano wrote:
Some vintage of diff says just "Files X and Y differ\n", instead
of "Binary files X and Y differ\n", so catch both patterns.

Signed-off-by: Junio C Hamano <redacted>

---

    Junio C Hamano [off-list ref] writes:

    >> Files /dev/null and b/file3 differ
    >> diff --git a/file4 b/file4
    >> index edc575d..adb07b7 100644
    >> Files a/file4 and b/file4 differ
    >
    > Thanks.  I've seen enough.  I expected diff (GNU diffutils 2.8.1
    > is what I have handy) output which says "Binary files a/foo and
    > b/foo differ".
    >
    > Hmph.  Now I'd need to find a way to catch at least these two
    > cases...

    Could you two try this patch please?
[snip snip]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help