summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-24 12:31:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-24 12:31:34 -0700
commitd508e4a8e2391ae2596403b6478d01cf3d5f928f (patch)
treecfdb8d28f963a2a1295d61f89b2293bb2408ed29 /merge-blobs.h
parentMerge branch 'db/make-with-curl' (diff)
parentt5801 (remote-helpers): cleanup environment sets (diff)
downloadtgif-d508e4a8e2391ae2596403b6478d01cf3d5f928f.tar.xz
Merge branch 'fc/transport-helper-sync-error-fix'
Make sure the marks are not written out when the transport helper did not finish happily, to avoid leaving a marks file that is out of sync with the reality. * fc/transport-helper-sync-error-fix: t5801 (remote-helpers): cleanup environment sets transport-helper: fix sync issue on crashes transport-helper: trivial cleanup transport-helper: propagate recvline() error pushing remote-helpers: make recvline return an error transport-helper: remove barely used xchgline()
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions