mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag: commit: do not lose mergetag header when not amending
This commit is contained in:
commit
4d466b69fe
1 changed files with 5 additions and 1 deletions
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue