summaryrefslogtreecommitdiff
path: root/t/t4049-diff-stat-count.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 17:00:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 18:50:50 (GMT)
commit74faaa16f016af9fc429770ba701f2aa598d9f21 (patch)
tree766143938969c67fdb19c3da5782bd3020fd9fb3 /t/t4049-diff-stat-count.sh
parent87a5461fa7b30f7b7baf27204f10219d61500fbf (diff)
downloadgit-74faaa16f016af9fc429770ba701f2aa598d9f21.zip
git-74faaa16f016af9fc429770ba701f2aa598d9f21.tar.gz
git-74faaa16f016af9fc429770ba701f2aa598d9f21.tar.bz2
Fix "git diff --stat" for interesting - but empty - file changes
The behavior of "git diff --stat" is rather odd for files that have zero lines of changes: it will discount them entirely unless they were renames. Which means that the stat output will simply not show files that only had "other" changes: they were created or deleted, or their mode was changed. Now, those changes do show up in the summary, but so do renames, so the diffstat logic is inconsistent. Why does it show renames with zero lines changed, but not mode changes or added files with zero lines changed? So change the logic to not check for "is_renamed", but for "is_interesting" instead, where "interesting" is judged to be any action but a pure data change (because a pure data change with zero data changed really isn't worth showing, if we ever get one in our diffpairs). So if you did chmod +x Makefile git diff --stat before, it would show empty (" 0 files changed"), with this it shows Makefile | 0 1 file changed, 0 insertions(+), 0 deletions(-) which I think is a more correct diffstat (and then with "--summary" it shows *what* the metadata change to Makefile was - this is completely consistent with our handling of renamed files). Side note: the old behavior was *really* odd. With no changes at all, "git diff --stat" output was empty. With just a chmod, it said "0 files changed". No way is our legacy behavior sane. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 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.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index b41eb61..7b3ef00 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -16,7 +16,8 @@ test_expect_success setup '
cat >expect <<-\EOF
a | 1 +
b | 1 +
- 2 files changed, 2 insertions(+)
+ ...
+ 4 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
test_i18ncmp expect actual