summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-31 02:55:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-31 06:22:14 (GMT)
commit95d3c4f546c664c3571dd4a93f11ae2f54e55e6e (patch)
tree47ecc50397a10256e9f27921bffa2689cdf51343 /receive-pack.c
parentcd83c74cb3161a19b5efd33f40cfe378c2f64ddb (diff)
downloadgit-95d3c4f546c664c3571dd4a93f11ae2f54e55e6e.zip
git-95d3c4f546c664c3571dd4a93f11ae2f54e55e6e.tar.gz
git-95d3c4f546c664c3571dd4a93f11ae2f54e55e6e.tar.bz2
Use /dev/null for update hook stdin.
Currently the update hook invoked by receive-pack has its stdin connected to the pushing client. The hook shouldn't attempt to read from this stream, and doing so may consume data that was meant for receive-pack. Instead we should give the update hook /dev/null as its stdin, ensuring that it always receives EOF and doesn't disrupt the protocol if it attempts to read any data. The post-update hook is similar, as it gets invoked with /dev/null on stdin to prevent the hook from reading data from the client. Previously we had invoked it with stdout also connected to /dev/null, throwing away anything on stdout, to prevent client protocol errors. Instead we should redirect stdout to stderr, like we do with the update hook. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
-rw-r--r--receive-pack.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/receive-pack.c b/receive-pack.c
index 48e4946..c176d8f 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -73,7 +73,8 @@ static int run_update_hook(const char *refname,
if (access(update_hook, X_OK) < 0)
return 0;
- code = run_command_opt(RUN_COMMAND_STDOUT_TO_STDERR,
+ code = run_command_opt(RUN_COMMAND_NO_STDIN
+ | RUN_COMMAND_STDOUT_TO_STDERR,
update_hook, refname, old_hex, new_hex, NULL);
switch (code) {
case 0:
@@ -188,7 +189,8 @@ static void run_update_post_hook(struct command *cmd)
argc++;
}
argv[argc] = NULL;
- run_command_v_opt(argv, RUN_COMMAND_NO_STDIO);
+ run_command_v_opt(argv, RUN_COMMAND_NO_STDIN
+ | RUN_COMMAND_STDOUT_TO_STDERR);
}
/*