combine-diff: honour --no-commit-id
authorJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 09:05:59 +0000 (02:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 09:05:59 +0000 (02:05 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
combine-diff.c

index 76ca6513699eb0de58fccac14afe7ee97646d69c..8bf99f215c36c701bb3ff2ffc952587b8562c920 100644 (file)
@@ -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++) {