summaryrefslogtreecommitdiff
path: root/shell.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-02-14 10:51:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-14 13:02:52 -0800
commit84a548dedd6520b73eb8764a8bebd8ede81620c8 (patch)
treed6a40d701bdb815ea486f190630c57c21ff4ca68 /shell.c
parentmerge-recursive: split out code for determining diff_filepairs (diff)
downloadtgif-84a548dedd6520b73eb8764a8bebd8ede81620c8.tar.xz
merge-recursive: make a helper function for cleanup for handle_renames
In anticipation of more involved cleanup to come, make a helper function for doing the cleanup at the end of handle_renames. Rename the already existing cleanup_rename[s]() to final_cleanup_rename[s](), name the new helper initial_cleanup_rename(), and leave the big comment in the code about why we can't do all the cleanup at once. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shell.c')
0 files changed, 0 insertions, 0 deletions