log --show-signature: reword the common two-head merge case

diff --git a/builtin/commit.c b/builtin/commit.c
index 7e8a1cf4e074053a78f2f029e8c03f17c9053bf0..970a83662a67a8f1c6cb8a67fd2e6636a5260948 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1493,8 +1493,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                exit(1);
        }
 
-       if (amend)
-               extra = read_commit_extra_headers(current_head);
+       if (amend) {
+               const char *exclude_gpgsig[2] = { "gpgsig", NULL };
+               extra = read_commit_extra_headers(current_head, exclude_gpgsig);
+       } else {
+               struct commit_extra_header **tail = &extra;
+               append_merge_tag_headers(parents, &tail);
+       }
 
        if (commit_tree_extended(sb.buf, active_cache_tree->sha1, parents, sha1,
                                 author_ident.buf, sign_commit, extra)) {