From: A Large Angry SCM <gitzilla@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: John Benes <smartcat99s@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] Deal with binary diff output from (unknown version of) diff
Date: Thu, 17 Nov 2005 20:58:26 -0800 [thread overview]
Message-ID: <437D5F72.8050100@gmail.com> (raw)
In-Reply-To: <7v1x1er2ai.fsf_-_@assigned-by-dhcp.cox.net>
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 <junkio@cox.net>
>
> ---
>
> Junio C Hamano <junkio@cox.net> 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]
next prev parent reply other threads:[~2005-11-18 4:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-15 14:42 stgit truncates binary files to zero length when applying patches Karl Hasselström
2005-11-16 11:11 ` Catalin Marinas
2005-11-16 11:54 ` Karl Hasselström
2005-11-16 12:31 ` Catalin Marinas
2005-11-16 13:03 ` Karl Hasselström
2005-11-16 18:30 ` Junio C Hamano
2005-11-16 22:15 ` [PATCH] git-apply: fail if a patch cannot be applied Junio C Hamano
2005-11-17 1:21 ` master has some toys Junio C Hamano
2005-11-17 8:29 ` Alex Riesen
2005-11-17 10:12 ` Junio C Hamano
2005-11-17 10:36 ` Alex Riesen
2005-11-17 11:03 ` Junio C Hamano
2005-11-18 1:23 ` John Benes
2005-11-18 2:48 ` Johannes Schindelin
2005-11-18 4:01 ` John Benes
2005-11-18 3:36 ` Junio C Hamano
2005-11-18 3:49 ` A Large Angry SCM
2005-11-18 4:26 ` Junio C Hamano
2005-11-18 4:46 ` [PATCH] Deal with binary diff output from (unknown version of) diff Junio C Hamano
2005-11-18 4:58 ` A Large Angry SCM [this message]
2005-11-18 4:01 ` master has some toys John Benes
2005-11-18 4:27 ` Junio C Hamano
2005-11-18 4:35 ` John Benes
2005-11-18 4:40 ` A Large Angry SCM
2005-11-17 11:22 ` Johannes Schindelin
2005-11-17 11:08 ` Johannes Schindelin
2005-11-17 11:16 ` Junio C Hamano
2005-11-17 11:21 ` Alex Riesen
2005-11-17 11:51 ` Johannes Schindelin
2005-11-17 12:40 ` Alex Riesen
2005-11-17 19:29 ` Junio C Hamano
2005-11-17 23:36 ` Johannes Schindelin
2005-11-18 20:09 ` Junio C Hamano
2005-11-18 12:01 ` timo
2005-11-17 11:20 ` Alex Riesen
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=437D5F72.8050100@gmail.com \
--to=gitzilla@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=smartcat99s@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).