summaryrefslogtreecommitdiff
path: root/ppc/sha1.c
diff options
context:
space:
mode:
authorLibravatar Thomas Gummerer <t.gummerer@gmail.com>2018-08-05 18:20:35 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-06 13:22:35 -0700
commit5ebbdad3447ccaaf5af18a5f4f8f5065bd9fff3d (patch)
tree052d0931fcf25d799c9195ae2de90ae12939c6a0 /ppc/sha1.c
parentrerere: factor out handle_conflict function (diff)
downloadtgif-5ebbdad3447ccaaf5af18a5f4f8f5065bd9fff3d.tar.xz
rerere: return strbuf from handle path
Currently we write the conflict to disk directly in the handle_path function. To make it re-usable for nested conflicts, instead of writing the conflict out directly, store it in a strbuf and let the caller write it out. This does mean some slight increase in memory usage, however that increase is limited to the size of the largest conflict we've currently processed. We already keep one copy of the conflict in memory, and it shouldn't be too large, so the increase in memory usage seems acceptable. As a bonus this lets us get replace the rerere_io_putconflict function with a trivial two line function. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ppc/sha1.c')
0 files changed, 0 insertions, 0 deletions