diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2008-07-04 21:10:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-05 00:37:44 -0700 |
| commit | 6cf91492d9cd985e1fa65181d99d6d578d4439dc (patch) | |
| tree | 167f08ae051d73ec55e1add3b85efa6fd370fe60 /t/t4100-apply-stat.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-6cf91492d9cd985e1fa65181d99d6d578d4439dc.tar.xz | |
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>
Diffstat (limited to 't/t4100-apply-stat.sh')
| -rwxr-xr-x | t/t4100-apply-stat.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh index be837bb98d..e0c67740a5 100755 --- a/t/t4100-apply-stat.sh +++ b/t/t4100-apply-stat.sh @@ -33,6 +33,8 @@ mode non git (1) non git (2) non git (3) +incomplete (1) +incomplete (2) EOF test_done |