diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-27 12:05:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:21:15 -0800 |
| commit | 82dfc2c44ecda8a7afe417086c704b141a11cd58 (patch) | |
| tree | b3be82aaf65709e70e1967db68ebfe889f6d23e1 /t | |
| parent | a20d3c0de1f107ddd719a4a9cec3addd56e8444f (diff) | |
| download | git-82dfc2c44ecda8a7afe417086c704b141a11cd58.tar.gz | |
diff --stat: do not count "unmerged" entries
Even though we show a separate *UNMERGED* entry in the patch and
diffstat output (or in the --raw format, for that matter) in
addition to and separately from the diff against the specified stage
(defaulting to #2) for unmerged paths, they should not be counted in
the total number of files affected---that would lead to counting the
same path twice.
The separation done by the previous step makes this fix simple and
straightforward. Among the filepairs in diff_queue, paths that
weren't modified, and the extra "unmerged" entries do not count as
total number of files.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4049-diff-stat-count.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh index 70ee073681..37f50cdef9 100755 --- a/t/t4049-diff-stat-count.sh +++ b/t/t4049-diff-stat-count.sh @@ -44,7 +44,7 @@ test_expect_success 'binary changes do not count in lines' ' test_i18ncmp expect actual ' -test_expect_failure 'exclude unmerged entries from total file count' ' +test_expect_success 'exclude unmerged entries from total file count' ' git reset --hard && echo a >a && echo b >b && |