Skip to content

Commit

Permalink
diff --stat: status of unmodified pair in diff-q is not zero
Browse files Browse the repository at this point in the history
It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Nov 27, 2012
1 parent 9667ccb commit 99bfd40
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion diff.c
Original file line number Diff line number Diff line change
@@ -2411,7 +2411,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
}

data = diffstat_add(diffstat, name_a, name_b);
data->is_interesting = p->status != 0;
data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;

if (!one || !two) {
data->is_unmerged = 1;

0 comments on commit 99bfd40

Please sign in to comment.