summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2014-04-12 15:33:32 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-14 14:03:33 -0700
commit3994e64d77d644df0f290f8bf5210ff0cb0adde2 (patch)
treec96da81ffda04e1d72e6464589fae51cdc245c78 /git-merge-octopus.sh
parenttransport-helper: trivial cleanup (diff)
downloadtgif-3994e64d77d644df0f290f8bf5210ff0cb0adde2.tar.xz
transport-helper: fix sync issue on crashes
When a remote helper crashes while pushing we should revert back to the state before the push, however, it's possible that `git fast-export` already finished its job, and therefore has exported the marks already. This creates a synchronization problem because from that moment on `git fast-{import,export}` will have marks that the remote helper is not aware of and all further commands fail (if those marks are referenced). The fix is to tell `git fast-export` to export to a temporary file, and only after the remote helper has finishes successfully, move to the final destination. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions