Browse Source
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>maint
Thomas Rast
17 years ago
committed by
Junio C Hamano
6 changed files with 29 additions and 1 deletions
@ -0,0 +1,2 @@
@@ -0,0 +1,2 @@
|
||||
t/t4100-apply-stat.sh | 2 +- |
||||
1 files changed, 1 insertions(+), 1 deletions(-) |
@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
|
||||
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh |
||||
index be837bb..0798c64 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 |
||||
+test_done |
||||
\ No newline at end of file |
@ -0,0 +1,2 @@
@@ -0,0 +1,2 @@
|
||||
t/t4100-apply-stat.sh | 2 +- |
||||
1 files changed, 1 insertions(+), 1 deletions(-) |
@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
|
||||
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 |
Loading…
Reference in new issue