mirror of
https://github.com/git/git.git
synced 2024-11-08 10:13:18 +01:00
c14b9d1e33
Sometimes, the easiest way to fix up a patch is to edit it directly, even adding or deleting lines. Now, many people are not as divine as certain benevolent dictators as to update the hunk headers correctly at the first try. So teach the tool to do it for us. [jc: with tests] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
38 lines
737 B
Bash
Executable file
38 lines
737 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)
|
|
EOF
|
|
|
|
test_done
|