Code

git-apply: prepare for upcoming GNU diff -u format change.
authorLinus Torvalds <torvalds@osdl.org>
Fri, 20 Oct 2006 02:26:08 +0000 (19:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:06 +0000 (21:28 -0700)
commitb507b465f7831612b9d9fc643e3e5218b64e5bfa
tree309972583a151079778743b0dd600fd0b541d6c7
parent6b09c7883f50044a68d93ef6872486bad2e93a9d
git-apply: prepare for upcoming GNU diff -u format change.

The latest GNU diff from CVS emits an empty line to express
an empty context line, instead of more traditional "single
white space followed by a newline".  Do not get broken by it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-apply.c
t/t4118-apply-empty-context.sh [new file with mode: 0755]