summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2017-02-11 20:51:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-13 14:33:32 -0800
commit590fc05293964160e4360431950325658d75fe23 (patch)
tree1ab99d1530f074adba624c27fe711145bf9012b5 /builtin/merge-recursive.c
parentMerge branch 'sb/submodule-rm-absorb' (diff)
downloadtgif-590fc05293964160e4360431950325658d75fe23.tar.xz
rm: reuse strbuf for all remove_dir_recursively() calls, again
Don't throw the memory allocated for remove_dir_recursively() away after a single call, use it for the other entries as well instead. This change was done before in deb8e15a (rm: reuse strbuf for all remove_dir_recursively() calls), but was reverted as a side-effect of 55856a35 (rm: absorb a submodules git dir before deletion). Reinstate the optimization. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions