From: "Peter Eriksen" <s022018@student.dtu.dk>
To: git@vger.kernel.org
Subject: Re: Problems with binary patches (pull) and spaces in filenames (gitk)
Date: Thu, 10 Nov 2005 00:33:00 +0100 [thread overview]
Message-ID: <20051109233300.GA23244@ebar091.ebar.dtu.dk> (raw)
In-Reply-To: <7v8xvxbg9y.fsf@assigned-by-dhcp.cox.net>
On Wed, Nov 09, 2005 at 02:36:09PM -0800, Junio C Hamano wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > Hmm. Perhaps a suboption to git-apply --stat to tell it not to
> > barf is helpful? In the meantime, could you pull with -n flag?
>
> Would this help?
>
> -- >8 -- cut here -- >8 --
> [PATCH] git-apply: do not barf on binary diff when not applying.
Yes, it seems to work. With my example it now shows the diff stats and
puts a "Bin" instead of the number of line changed. It could show the
change in the size, but as it is, it's fine with me. Please apply.
Peter
next prev parent reply other threads:[~2005-11-09 23:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-09 21:37 Problems with binary patches (pull) and spaces in filenames (gitk) Peter Eriksen
2005-11-09 22:09 ` Junio C Hamano
2005-11-09 22:36 ` Junio C Hamano
2005-11-09 23:33 ` Peter Eriksen [this message]
2005-11-09 23:00 ` Jan Harkes
2005-11-09 22:10 ` Linus Torvalds
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=20051109233300.GA23244@ebar091.ebar.dtu.dk \
--to=s022018@student.dtu.dk \
--cc=git@vger.kernel.org \
/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