summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-12 10:01:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-14 04:37:10 (GMT)
commit74e2abe5b70aadf06984472ba9aa9a29900040e6 (patch)
treec433ef8984acbfe38df0bf885f5ce0dadabd8dd0 /combine-diff.c
parent4035b46e12ee6e5c9339e263cd16c2e2422b8928 (diff)
downloadgit-74e2abe5b70aadf06984472ba9aa9a29900040e6.zip
git-74e2abe5b70aadf06984472ba9aa9a29900040e6.tar.gz
git-74e2abe5b70aadf06984472ba9aa9a29900040e6.tar.bz2
diff --numstat
[jc: with documentation from Jakub] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 46d9121..65c7868 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -856,8 +856,10 @@ void diff_tree_combined(const unsigned char *sha1,
/* show stat against the first parent even
* when doing combined diff.
*/
- if (i == 0 && opt->output_format & DIFF_FORMAT_DIFFSTAT)
- diffopts.output_format = DIFF_FORMAT_DIFFSTAT;
+ int stat_opt = (opt->output_format &
+ (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT));
+ if (i == 0 && stat_opt)
+ diffopts.output_format = stat_opt;
else
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_tree_sha1(parent[i], sha1, "", &diffopts);
@@ -887,7 +889,8 @@ void diff_tree_combined(const unsigned char *sha1,
}
needsep = 1;
}
- else if (opt->output_format & DIFF_FORMAT_DIFFSTAT)
+ else if (opt->output_format &
+ (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT))
needsep = 1;
if (opt->output_format & DIFF_FORMAT_PATCH) {
if (needsep)