summaryrefslogtreecommitdiff
path: root/t/t4049-diff-stat-count.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-29 17:46:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-11-29 17:46:30 (GMT)
commitde9095955c581a664d9ce568a1ae58a98484090e (patch)
treee2eae1a3b34bb485d9d01b198276c91898ae8589 /t/t4049-diff-stat-count.sh
parent20c8cde45656fc187e06088ef5baf0bbdfdf70bd (diff)
downloadgit-de9095955c581a664d9ce568a1ae58a98484090e.zip
git-de9095955c581a664d9ce568a1ae58a98484090e.tar.gz
git-de9095955c581a664d9ce568a1ae58a98484090e.tar.bz2
t4049: refocus tests
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>
Diffstat (limited to 't/t4049-diff-stat-count.sh')
-rwxr-xr-xt/t4049-diff-stat-count.sh20
1 files changed, 9 insertions, 11 deletions
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index 37f50cd..5b594e8 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -13,32 +13,31 @@ test_expect_success 'setup' '
git commit -m initial
'
-test_expect_success 'limit output to 2 (simple)' '
+test_expect_success 'mode-only change show as a 0-line change' '
git reset --hard &&
- chmod +x c d &&
+ test_chmod +x b d &&
echo a >a &&
- echo b >b &&
+ echo c >c &&
cat >expect <<-\EOF
a | 1 +
- b | 1 +
+ b | 0
...
4 files changed, 2 insertions(+)
EOF
- git diff --stat --stat-count=2 >actual &&
+ 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 &&
- chmod +x c d &&
echo a >a &&
- echo b >b &&
+ echo c >c &&
cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
cat >expect <<-\EOF
a | 1 +
- b | 1 +
+ c | 1 +
...
- 4 files changed, 2 insertions(+)
+ 3 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
test_i18ncmp expect actual
@@ -56,12 +55,11 @@ test_expect_success 'exclude unmerged entries from total file count' '
done |
git update-index --index-info &&
echo d >d &&
- chmod +x c d &&
cat >expect <<-\EOF
a | 1 +
b | 1 +
...
- 4 files changed, 3 insertions(+)
+ 3 files changed, 3 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
test_i18ncmp expect actual