combine-diff: honour --no-commit-id
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Oct 26, 2006 at 02:05 UTC
44152787bcb4fd003d1f5b8c2a7591445cee8f20
1 file changed
+3
-3
combine-diff.c
+3
-3
@@ -741,7 +741,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
741
int added = 0;
742
int deleted = 0;
743
744
- if (rev->loginfo)
744
+ if (rev->loginfo && !rev->no_commit_id)
745
show_log(rev, opt->msg_sep);
746
dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
747
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
819
if (!line_termination)
820
inter_name_termination = 0;
821
822
- if (rev->loginfo)
822
+ if (rev->loginfo && !rev->no_commit_id)
823
show_log(rev, opt->msg_sep);
824
825
if (opt->output_format & DIFF_FORMAT_RAW) {
@@ -891,7 +891,7 @@ void diff_tree_combined(const unsigned char *sha1,
891
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
892
diffopts.recursive = 1;
893
894
- show_log_first = !!rev->loginfo;
894
+ show_log_first = !!rev->loginfo && !rev->no_commit_id;
895
needsep = 0;
896
/* find set of paths that everybody touches */
897
for (i = 0; i < num_parent; i++) {