summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-26 09:05:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-26 09:05:59 (GMT)
commit44152787bcb4fd003d1f5b8c2a7591445cee8f20 (patch)
treee7cc73d09ac60f7376f1d0114bf1fd948fbb0c11 /combine-diff.c
parent7a8ac59f2f1fdac71fdffe53eebdca382118585f (diff)
downloadgit-44152787bcb4fd003d1f5b8c2a7591445cee8f20.zip
git-44152787bcb4fd003d1f5b8c2a7591445cee8f20.tar.gz
git-44152787bcb4fd003d1f5b8c2a7591445cee8f20.tar.bz2
combine-diff: honour --no-commit-id
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 76ca651..8bf99f2 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -741,7 +741,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
int added = 0;
int deleted = 0;
- if (rev->loginfo)
+ if (rev->loginfo && !rev->no_commit_id)
show_log(rev, opt->msg_sep);
dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
elem->path, c_meta, c_reset);
@@ -819,7 +819,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
if (!line_termination)
inter_name_termination = 0;
- if (rev->loginfo)
+ if (rev->loginfo && !rev->no_commit_id)
show_log(rev, opt->msg_sep);
if (opt->output_format & DIFF_FORMAT_RAW) {
@@ -891,7 +891,7 @@ void diff_tree_combined(const unsigned char *sha1,
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
diffopts.recursive = 1;
- show_log_first = !!rev->loginfo;
+ show_log_first = !!rev->loginfo && !rev->no_commit_id;
needsep = 0;
/* find set of paths that everybody touches */
for (i = 0; i < num_parent; i++) {