summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-27 11:17:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-27 13:21:15 -0800
commit99bfd407000302ff27f2809d9d556c97427a9e3b (patch)
treeb23e6170907b2980cff89e2c88dc92b26310c3c5
parenttest: add failing tests for "diff --stat" to t4049 (diff)
downloadtgif-99bfd407000302ff27f2809d9d556c97427a9e3b.tar.xz
diff --stat: status of unmodified pair in diff-q is not zero
It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 95bbad66c6..ce6baa4c69 100644
--- a/diff.c
+++ b/diff.c
@@ -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;