Merge branch 'jc/pull-signed-tag'

gitster · gitster · commit 4d466b69fe46 · 2011-12-20T13:24:12.000-08:00
* jc/pull-signed-tag:
  commit: do not lose mergetag header when not amending
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -1485,8 +1485,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		exit(1);
 	}
 
-	if (amend)
+	if (amend) {
 		extra = read_commit_extra_headers(current_head);
+	} 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, extra)) {
