summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-25 22:34:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-11 02:03:21 (GMT)
commit27d6b08536838fff0e3568a57cc622ca1c39bf01 (patch)
treece080056cf1a937c1ab4f495f53d04e40761ef4a /rerere.h
parentd58ee6dbf67614ef4854e0d8af8188cd84ae5107 (diff)
downloadgit-27d6b08536838fff0e3568a57cc622ca1c39bf01.zip
git-27d6b08536838fff0e3568a57cc622ca1c39bf01.tar.gz
git-27d6b08536838fff0e3568a57cc622ca1c39bf01.tar.bz2
rerere: refactor rerere logic to make it independent from I/O
This splits the handle_file() function into in-core part and I/O parts of the logic to create the preimage, so that we can compute the conflict identifier without having to use temporary files. Earlier, I thought the output from handle_file() should also be refactored, but it is always about writing preimage (or thisimage) that is used for later three-way merge, so it is saner to keep it to always write to FILE *. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions