summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 22:32:38 (GMT)
committerJeff King <peff@peff.net>2015-12-01 22:32:38 (GMT)
commit40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d (patch)
tree95a2da48eec35b7bfacf36beb80b05dcea84d6e1 /builtin
parent1bc8feaa7cc752fe3b902ccf83ae9332e40921db (diff)
parent908a6e4156dff47d4877478383fd4b79592010e2 (diff)
downloadgit-40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d.zip
git-40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d.tar.gz
git-40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d.tar.bz2
Merge branch 'maint'
* maint: http: treat config options sslCAPath and sslCAInfo as paths Documentation/diff: give --word-diff-regex=. example filter-branch: deal with object name vs. pathname ambiguity in tree-filter check-ignore: correct documentation about output git-p4: clean up after p4 submit failure git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head remote-http(s): support SOCKS proxies t5813: avoid creating urls that break on cygwin Escape Git's exec path in contrib/rerere-train.sh script allow hooks to ignore their standard input stream rebase-i-exec: Allow space in SHELL_PATH Documentation: make environment variable formatting more consistent
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index dca09e2..f2a8b78 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -32,6 +32,7 @@
#include "sequencer.h"
#include "notes-utils.h"
#include "mailmap.h"
+#include "sigchain.h"
static const char * const builtin_commit_usage[] = {
N_("git commit [<options>] [--] <pathspec>..."),
@@ -1537,8 +1538,10 @@ static int run_rewrite_hook(const unsigned char *oldsha1,
return code;
n = snprintf(buf, sizeof(buf), "%s %s\n",
sha1_to_hex(oldsha1), sha1_to_hex(newsha1));
+ sigchain_push(SIGPIPE, SIG_IGN);
write_in_full(proc.in, buf, n);
close(proc.in);
+ sigchain_pop(SIGPIPE);
return finish_command(&proc);
}