summaryrefslogtreecommitdiff
path: root/connected.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-07-15 10:32:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-20 19:11:01 (GMT)
commite0331849a081fe4919f4130540165ce7d7355748 (patch)
tree6c137f62c906f641c7717bc3cf09791925152985 /connected.c
parent7043c7071cdbdef60ce8413f425da622b8e6dc85 (diff)
downloadgit-e0331849a081fe4919f4130540165ce7d7355748.zip
git-e0331849a081fe4919f4130540165ce7d7355748.tar.gz
git-e0331849a081fe4919f4130540165ce7d7355748.tar.bz2
check_connected: relay errors to alternate descriptor
Unless the "quiet" flag is given, check_connected sends any errors to the stderr of the caller (because the child rev-list inherits that descriptor). However, server-side callers may want to send these over a sideband channel instead. Let's make that possible. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connected.c')
-rw-r--r--connected.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/connected.c b/connected.c
index 2a51eac..5f5c8bd 100644
--- a/connected.c
+++ b/connected.c
@@ -31,8 +31,11 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
opt = &defaults;
transport = opt->transport;
- if (fn(cb_data, sha1))
+ if (fn(cb_data, sha1)) {
+ if (opt->err_fd)
+ close(opt->err_fd);
return err;
+ }
if (transport && transport->smart_options &&
transport->smart_options->self_contained_and_connected &&
@@ -59,7 +62,11 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
rev_list.git_cmd = 1;
rev_list.in = -1;
rev_list.no_stdout = 1;
- rev_list.no_stderr = opt->quiet;
+ if (opt->err_fd)
+ rev_list.err = opt->err_fd;
+ else
+ rev_list.no_stderr = opt->quiet;
+
if (start_command(&rev_list))
return error(_("Could not run 'git rev-list'"));