mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00

12 lines

245 B

Diff

Raw Normal View History

Fix apply --recount handling of no-EOL line If a patch modifies the last line of a file that previously had no terminating '\n', it looks like -old text \ No newline at end of file +new text Hence, a '\' line does not signal the end of the hunk. This modifies 'git apply --recount' to take this into account. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-07-04 21:10:14 +02:00			`diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh`
			`index 0798c64..be837bb 100755`
			`--- a/t/t4100-apply-stat.sh`
			`+++ b/t/t4100-apply-stat.sh`
			`@@ -35,4 +35,4 @@ non git (2)`
			`non git (3)`
			`EOF`

			`-test_done`
			`\ No newline at end of file`
			`+test_done`