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 /git-gui/lib/merge.tcl | |
| parent | diff --stat: move the "total count" logic to the last loop (diff) | |
| download | tgif-82dfc2c44ecda8a7afe417086c704b141a11cd58.tar.xz | |
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 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions