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

Re: BUG?: git-apply sometimes says "corrupt patch" when adding single lines

From: Tor Arvid Lund <hidden>
Date: 2016-06-15 22:49:20

On Wed, Aug 18, 2010 at 9:29 AM, Johannes Sixt [off-list ref] wrote:
Am 8/18/2010 1:27, schrieb Tor Arvid Lund:
quoted
I often use git-gui when staging commits, and I noticed that if the
file I'm working with has a:

\ No newline at end of file

... as the last line of the diff, and I try to "Stage lines for
commit", then git-gui (or really git-apply, as I understand it) says
that I have a "corrupt patch at line <so-and-so>".

Is this a bug? Or is it maybe git-gui that sends something wrong to
git-apply? I don't know... :-/
This is really a bug in git-gui, not in git-apply: The big while loop in
lib/diff.tcl, function apply_range_or_line, must be taught about "\ No
newline...".
Ok, thanks for tracking it down. I suspected this, since the tests for
git-apply seemed to have example patches for "\ No newline...".
Ultimately, this doesn't scratch me enough that I want to learn (or
guess) how to fix the Tcl stuff...

-Tor Arvid-
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help