de9095955c
The primary thing Linus's patch wanted to change was to make sure that 0-line change appears for a mode-only change. Update the first test to chmod a file that we can see in the output (limited by --stat-count) to demonstrate it. Also make sure to use test_chmod and compare the index and the tree, so that we can run this test even on a filesystem without permission bits. Later two tests are about fixes to separate issues that were introduced and/or uncovered by Linus's patch as a side effect, but the issues are not related to mode-only changes. Remove chmod from the tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.2 KiB
Bash
Executable File
69 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2011, Google Inc.
|
|
|
|
test_description='diff --stat-count'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
>a &&
|
|
>b &&
|
|
>c &&
|
|
>d &&
|
|
git add a b c d &&
|
|
git commit -m initial
|
|
'
|
|
|
|
test_expect_success 'mode-only change show as a 0-line change' '
|
|
git reset --hard &&
|
|
test_chmod +x b d &&
|
|
echo a >a &&
|
|
echo c >c &&
|
|
cat >expect <<-\EOF
|
|
a | 1 +
|
|
b | 0
|
|
...
|
|
4 files changed, 2 insertions(+)
|
|
EOF
|
|
git diff --stat --stat-count=2 HEAD >actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'binary changes do not count in lines' '
|
|
git reset --hard &&
|
|
echo a >a &&
|
|
echo c >c &&
|
|
cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
|
|
cat >expect <<-\EOF
|
|
a | 1 +
|
|
c | 1 +
|
|
...
|
|
3 files changed, 2 insertions(+)
|
|
EOF
|
|
git diff --stat --stat-count=2 >actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'exclude unmerged entries from total file count' '
|
|
git reset --hard &&
|
|
echo a >a &&
|
|
echo b >b &&
|
|
git ls-files -s a >x &&
|
|
git rm -f d &&
|
|
for stage in 1 2 3
|
|
do
|
|
sed -e "s/ 0 a/ $stage d/" x
|
|
done |
|
|
git update-index --index-info &&
|
|
echo d >d &&
|
|
cat >expect <<-\EOF
|
|
a | 1 +
|
|
b | 1 +
|
|
...
|
|
3 files changed, 3 insertions(+)
|
|
EOF
|
|
git diff --stat --stat-count=2 >actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_done
|