summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:44 -0700
commitbdab1bca53b71fd6bd2420d1e007eb2ef7b8abc3 (patch)
tree47cf14e920aad5a552426fd0b3b4c024f3d31cf5 /builtin
parentMerge branch 'jk/prune-packed-server-info' (diff)
parentreceive-pack: allow hooks to ignore its standard input stream (diff)
downloadtgif-bdab1bca53b71fd6bd2420d1e007eb2ef7b8abc3.tar.xz
Merge branch 'jc/ignore-sigpipe-while-running-hooks'
pre- and post-receive hooks are no longer required to read all their inputs. * jc/ignore-sigpipe-while-running-hooks: receive-pack: allow hooks to ignore its standard input stream
Diffstat (limited to 'builtin')
-rw-r--r--builtin/receive-pack.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index afb8d99264..daf0600ca3 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -15,6 +15,7 @@
#include "connected.h"
#include "argv-array.h"
#include "version.h"
+#include "sigchain.h"
static const char receive_pack_usage[] = "git receive-pack <git-dir>";
@@ -287,6 +288,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
return code;
}
+ sigchain_push(SIGPIPE, SIG_IGN);
+
while (1) {
const char *buf;
size_t n;
@@ -298,6 +301,9 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
close(proc.in);
if (use_sideband)
finish_async(&muxer);
+
+ sigchain_pop(SIGPIPE);
+
return finish_command(&proc);
}