Junio C Hamano 0074d18dc0 commit: do not lose mergetag header when not amending ...

The earlier ed7a42a (commit: teach --amend to carry forward extra headers,
2011-11-08) broke "git merge/pull; edit to fix conflict; git commit"
workflow by forgetting that commit_tree_extended() takes the whole extra
header list.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-12-20 13:22:41 -08:00

43 KiB

Raw Blame History

View Raw