kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2012-11-27 12:05:10 -08:00
parent a20d3c0de1
commit 82dfc2c44e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -1669,12 +1669,14 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
struct diffstat_file *file = data->files[i]; struct diffstat_file *file = data->files[i];
uintmax_t added = file->added; uintmax_t added = file->added;
uintmax_t deleted = file->deleted; uintmax_t deleted = file->deleted;
if (!file->is_interesting && (added + deleted == 0)) {
if (file->is_unmerged ||
(!file->is_interesting && (added + deleted == 0))) {
total_files--; total_files--;
continue; continue;
} }


if (!file->is_binary && !file->is_unmerged) { if (!file->is_binary) {
adds += added; adds += added;
dels += deleted; dels += deleted;
} }

2
t/t4049-diff-stat-count.sh
View File

@ -44,7 +44,7 @@ test_expect_success 'binary changes do not count in lines' '
test_i18ncmp expect actual 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 && git reset --hard &&
echo a >a && echo a >a &&
echo b >b && echo b >b &&