| commit | 82dfc2c44ecda8a7afe417086c704b141a11cd58 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Nov 2012 20:05:10 +0000 (27 12:05 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Nov 2012 21:21:15 +0000 (27 13:21 -0800) | ||
| tree | b3be82aaf65709e70e1967db68ebfe889f6d23e1 | treesnapshot (tar.gz zip) |
| parent | a20d3c0de1f107ddd719a4a9cec3addd56e8444f | commitdiff |
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>
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>
| diff.c | diffblobblamehistory | |
| t/t4049-diff-stat-count.sh | diffblobblamehistory |