summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-28 16:28:00 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-24 15:08:27 -0700
commite2cb6a950b4617edc3d07b372063b624b2b5c420 (patch)
treeee3c18e567dfbc38c523139ab292225318e1a314 /git-merge-octopus.sh
parentf5800f6ad8b8cbf41a252f7ca0ae465217174c60 (diff)
downloadgit-e2cb6a950b4617edc3d07b372063b624b2b5c420.tar.gz
rerere: write out each record of MERGE_RR in one go
Instead of writing the hash for a conflict, a HT, and the path with three separate write_in_full() calls, format them into a single record into a strbuf and write it out in one go. As a more recent "rerere remaining" codepath abuses the .util field of the merge_rr data to store a sentinel token, make sure that codepath does not call into this function (of course, "remaining" is a read-only operation and currently does not call it). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions