mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
6cf91492d9
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>
40 lines
767 B
Bash
Executable file
40 lines
767 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git apply --stat --summary test, with --recount
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
UNC='s/^\(@@ -[1-9][0-9]*\),[0-9]* \(+[1-9][0-9]*\),[0-9]* @@/\1,999 \2,999 @@/'
|
|
|
|
num=0
|
|
while read title
|
|
do
|
|
num=$(( $num + 1 ))
|
|
test_expect_success "$title" '
|
|
git apply --stat --summary \
|
|
<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
|
|
test_cmp ../t4100/t-apply-$num.expect current
|
|
'
|
|
|
|
test_expect_success "$title with recount" '
|
|
sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
|
|
git apply --recount --stat --summary >current &&
|
|
test_cmp ../t4100/t-apply-$num.expect current
|
|
'
|
|
done <<\EOF
|
|
rename
|
|
copy
|
|
rewrite
|
|
mode
|
|
non git (1)
|
|
non git (2)
|
|
non git (3)
|
|
incomplete (1)
|
|
incomplete (2)
|
|
EOF
|
|
|
|
test_done
|