diff --git a/builtin/commit.c b/builtin/commit.c
index 7e8a1cf4e074053a78f2f029e8c03f17c9053bf0..fa41ec8c878a6af63e17b79996148be85dcfccef 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
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, sign_commit, extra)) {