mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
6f8d9bccb2
When -W is given we search the lines between the end of the current context and the next change for a function line. If there is none then we merge those two hunks as they must be part of the same function. If the next change is an appended chunk we abort the search early in get_func_line(), however, because its line number is out of range. Fix that by searching from the end of the pre-image in that case instead. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
182 lines
4.5 KiB
Bash
Executable file
182 lines
4.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff function context'
|
|
|
|
. ./test-lib.sh
|
|
|
|
dir="$TEST_DIRECTORY/t4051"
|
|
|
|
commit_and_tag () {
|
|
tag=$1 &&
|
|
shift &&
|
|
git add "$@" &&
|
|
test_tick &&
|
|
git commit -m "$tag" &&
|
|
git tag "$tag"
|
|
}
|
|
|
|
first_context_line () {
|
|
awk '
|
|
found {print; exit}
|
|
/^@@/ {found = 1}
|
|
'
|
|
}
|
|
|
|
last_context_line () {
|
|
sed -ne \$p
|
|
}
|
|
|
|
check_diff () {
|
|
name=$1
|
|
desc=$2
|
|
options="-W $3"
|
|
|
|
test_expect_success "$desc" '
|
|
git diff $options "$name^" "$name" >"$name.diff"
|
|
'
|
|
|
|
test_expect_success ' diff applies' '
|
|
test_when_finished "git reset --hard" &&
|
|
git checkout --detach "$name^" &&
|
|
git apply --index "$name.diff" &&
|
|
git diff --exit-code "$name"
|
|
'
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
|
|
"$dir/dummy.c" "$dir/dummy.c" >file.c &&
|
|
commit_and_tag initial file.c &&
|
|
|
|
grep -v "delete me from hello" <file.c >file.c.new &&
|
|
mv file.c.new file.c &&
|
|
commit_and_tag changed_hello file.c &&
|
|
|
|
grep -v "delete me from includes" <file.c >file.c.new &&
|
|
mv file.c.new file.c &&
|
|
commit_and_tag changed_includes file.c &&
|
|
|
|
cat "$dir/appended1.c" >>file.c &&
|
|
commit_and_tag appended file.c &&
|
|
|
|
cat "$dir/appended2.c" >>file.c &&
|
|
commit_and_tag extended file.c &&
|
|
|
|
grep -v "Begin of second part" <file.c >file.c.new &&
|
|
mv file.c.new file.c &&
|
|
commit_and_tag long_common_tail file.c &&
|
|
|
|
git checkout initial &&
|
|
grep -v "delete me from hello" <file.c >file.c.new &&
|
|
mv file.c.new file.c &&
|
|
cat "$dir/appended1.c" >>file.c &&
|
|
commit_and_tag changed_hello_appended file.c
|
|
'
|
|
|
|
check_diff changed_hello 'changed function'
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^ .*Begin of hello" changed_hello.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^ .*End of hello" changed_hello.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
|
|
'
|
|
|
|
test_expect_success ' context does not include preceding empty lines' '
|
|
test "$(first_context_line <changed_hello.diff)" != " "
|
|
'
|
|
|
|
test_expect_success ' context does not include trailing empty lines' '
|
|
test "$(last_context_line <changed_hello.diff)" != " "
|
|
'
|
|
|
|
check_diff changed_includes 'changed includes'
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^ .*Begin.h" changed_includes.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^ .*End.h" changed_includes.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
|
|
'
|
|
|
|
test_expect_success ' context does not include trailing empty lines' '
|
|
test "$(last_context_line <changed_includes.diff)" != " "
|
|
'
|
|
|
|
check_diff appended 'appended function'
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^[+].*Begin of first part" appended.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^[+].*End of first part" appended.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
|
|
'
|
|
|
|
check_diff extended 'appended function part'
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^ .*Begin of first part" extended.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^[+].*End of second part" extended.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
|
|
'
|
|
|
|
test_expect_success ' context does not include preceding empty lines' '
|
|
test "$(first_context_line <extended.diff)" != " "
|
|
'
|
|
|
|
check_diff long_common_tail 'change with long common tail and no context' -U0
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^ .*Begin of first part" long_common_tail.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^ .*End of second part" long_common_tail.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
|
|
'
|
|
|
|
test_expect_success ' context does not include preceding empty lines' '
|
|
test "$(first_context_line <long_common_tail.diff.diff)" != " "
|
|
'
|
|
|
|
check_diff changed_hello_appended 'changed function plus appended function'
|
|
|
|
test_expect_success ' context includes begin' '
|
|
grep "^ .*Begin of hello" changed_hello_appended.diff &&
|
|
grep "^[+].*Begin of first part" changed_hello_appended.diff
|
|
'
|
|
|
|
test_expect_success ' context includes end' '
|
|
grep "^ .*End of hello" changed_hello_appended.diff &&
|
|
grep "^[+].*End of first part" changed_hello_appended.diff
|
|
'
|
|
|
|
test_expect_success ' context does not include other functions' '
|
|
test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
|
|
'
|
|
|
|
test_done
|