Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 21:00:37 +0400
committerJunio C Hamano <gitster@pobox.com>2012-10-17 22:50:50 +0400
commit74faaa16f016af9fc429770ba701f2aa598d9f21 (patch)
tree766143938969c67fdb19c3da5782bd3020fd9fb3 /t/t4006-diff-mode.sh
parent87a5461fa7b30f7b7baf27204f10219d61500fbf (diff)
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/t4006-diff-mode.sh')
-rwxr-xr-xt/t4006-diff-mode.sh46
1 files changed, 23 insertions, 23 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 3d4b1ba23f..05911492ca 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -32,28 +32,28 @@ test_expect_success 'prepare binary file' '
git commit -m binbin
'
-test_expect_success '--stat output after text chmod' '
- test_chmod -x rezrov &&
- echo " 0 files changed" >expect &&
- git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
-'
-
-test_expect_success '--shortstat output after text chmod' '
- git diff HEAD --shortstat >actual &&
- test_i18ncmp expect actual
-'
-
-test_expect_success '--stat output after binary chmod' '
- test_chmod +x binbin &&
- echo " 0 files changed" >expect &&
- git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
-'
-
-test_expect_success '--shortstat output after binary chmod' '
- git diff HEAD --shortstat >actual &&
- test_i18ncmp expect actual
-'
+# test_expect_success '--stat output after text chmod' '
+# test_chmod -x rezrov &&
+# echo " 0 files changed" >expect &&
+# git diff HEAD --stat >actual &&
+# test_i18ncmp expect actual
+# '
+#
+# test_expect_success '--shortstat output after text chmod' '
+# git diff HEAD --shortstat >actual &&
+# test_i18ncmp expect actual
+# '
+#
+# test_expect_success '--stat output after binary chmod' '
+# test_chmod +x binbin &&
+# echo " 0 files changed" >expect &&
+# git diff HEAD --stat >actual &&
+# test_i18ncmp expect actual
+# '
+#
+# test_expect_success '--shortstat output after binary chmod' '
+# git diff HEAD --shortstat >actual &&
+# test_i18ncmp expect actual
+# '
test_done