summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-09-05 08:14:07 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-06 17:19:52 +0900
commitc82c75b9518750a94e38c84fc89741a51b815014 (patch)
treea63ff13b872b8614172ab8a77151039cf61b83aa /t/t7610-mergetool.sh
parentThe sixth batch post 2.14 (diff)
downloadtgif-c82c75b9518750a94e38c84fc89741a51b815014.tar.xz
write_index_as_tree: cleanup tempfile on error
If we failed to write our new index file, we rollback our lockfile to remove the temporary index. But if we fail before we even get to the write step (because reading the old index failed), we leave the lockfile in place, which makes no sense. In practice this hasn't been a big deal because failing at write_index_as_tree() typically results in the whole program exiting (and thus the tempfile handler kicking in and cleaning up the files). But this function should consistently take responsibility for the resources it allocates. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions