mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
Code Activity

Merge branch 'jc/pull-signed-tag'

Browse source 
* jc/pull-signed-tag:
  commit: do not lose mergetag header when not amending
This commit is contained in:
Junio C Hamano 2011-12-20 13:24:12 -08:00
commit 4d466b69fe
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builtin/commit.c
View file

@ -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)) {