summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
commit867b520301cc5e719b575edde7736ebe70a19298 (patch)
tree518a7677382c18be1913971a955311babd9dfe9d /builtin/merge-ours.c
parentThe fifth batch (diff)
parentreceive-pack: purge temporary data if no command is ready to run (diff)
downloadtgif-867b520301cc5e719b575edde7736ebe70a19298.tar.xz
Merge branch 'cb/clear-quarantine-early-on-all-ref-update-errors'
"receive-pack" checks if it will do any ref updates (various conditions could reject a push) before received objects are taken out of the temporary directory used for quarantine purposes, so that a push that is known-to-fail will not leave crufts that a future "gc" needs to clean up. * cb/clear-quarantine-early-on-all-ref-update-errors: receive-pack: purge temporary data if no command is ready to run
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions