summaryrefslogtreecommitdiff
path: root/t/t7500
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-07 16:21:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-09 10:28:04 -0800
commit5231c633f2e54723d53a8cd928d9bc98b39dc35f (patch)
treeb7f624f3742c4baf285d1e59ee1a1dbab1198fee /t/t7500
parentmerge: record tag objects without peeling in MERGE_HEAD (diff)
downloadtgif-5231c633f2e54723d53a8cd928d9bc98b39dc35f.tar.xz
commit: copy merged signed tags to headers of merge commit
Now MERGE_HEAD records the tag objects without peeling, we could record the result of manual conflict resolution via "git commit" without losing the tag information. Introduce a new "mergetag" multi-line header field to the commit object, and use it to store the entire contents of each signed tag merged. A commit header that has a multi-line payload begins with the header tag (e.g. "mergetag" in this case), SP, the first line of payload, LF, and all the remaining lines have a SP inserted at the beginning. In hindsight, it would have been better to make "merge --continue" as the way to continue from such an interrupted merge, not "commit", but this is a backward compatibility baggage we would need to carry around for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7500')
0 files changed, 0 insertions, 0 deletions