mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
![Thomas Rast](/assets/img/avatar_default.png)
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>
12 lines
245 B
Diff
12 lines
245 B
Diff
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
|