summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-04-19 22:50:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-20 20:33:53 (GMT)
commit3e8b06d09c48a46ad7fee761a58040a7b006a642 (patch)
treea62f59c61570ee1222398a5be85e6821ec124910 /send-pack.c
parentc792d7b6cebe302d6e0377d9d983608309bcd775 (diff)
downloadgit-3e8b06d09c48a46ad7fee761a58040a7b006a642.zip
git-3e8b06d09c48a46ad7fee761a58040a7b006a642.tar.gz
git-3e8b06d09c48a46ad7fee761a58040a7b006a642.tar.bz2
send-pack: isolate sigpipe in demuxer thread
If we get an error from pack-objects, we may exit send_pack() early, before reading the server's status response. In such a case, we may racily see SIGPIPE from our async demuxer (which is trying to write that status back to us), and we'd prefer to continue pushing the error up the call stack, rather than taking down the whole process with signal death. This is safe to do because our demuxer just calls recv_sideband, whose data writes are all done with write_or_die(), which will notice SIGPIPE. We do also write sideband 2 to stderr, and we would no longer die on SIGPIPE there (if it were piped in the first place, and if the piped program went away). But that's probably a good thing, as it likewise should not abort the push process at all (neither immediately by signal, nor eventually by reporting failure back to the main thread). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'send-pack.c')
-rw-r--r--send-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/send-pack.c b/send-pack.c
index fc27db6..37ee04e 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -518,6 +518,7 @@ int send_pack(struct send_pack_args *args,
demux.proc = sideband_demux;
demux.data = fd;
demux.out = -1;
+ demux.isolate_sigpipe = 1;
if (start_async(&demux))
die("send-pack: unable to fork off sideband demultiplexer");
in = demux.out;