diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:06 -0800 |
| commit | 76c39289bac153ddb661062dcc25881c690c20e5 (patch) | |
| tree | 3dd1ca47df57cbef5c1d7f88109461feb6b3f68c /t/t4049-diff-stat-count.sh | |
| parent | Merge branch 'sg/complete-help-undup' (diff) | |
| parent | Fix "git diff --stat" for interesting - but empty - file changes (diff) | |
| download | tgif-76c39289bac153ddb661062dcc25881c690c20e5.tar.xz | |
Merge branch 'lt/diff-stat-show-0-lines'
We failed to mention a file without any content change but whose
permission bit was modified, or (worse yet) a new file without any
content in the "git diff --stat" output.
* lt/diff-stat-show-0-lines:
Fix "git diff --stat" for interesting - but empty - file changes
Diffstat (limited to 't/t4049-diff-stat-count.sh')
| -rwxr-xr-x | t/t4049-diff-stat-count.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh index b41eb61ca8..7b3ef00533 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 |