summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-07-15 06:36:35 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-20 12:11:11 -0700
commit6b4cd2f82791b0c9726616832382e0af8d895d99 (patch)
tree702159c112e2c7341cd49317e5a652771cecfee5
parentreceive-pack: relay connectivity errors to sideband (diff)
downloadtgif-6b4cd2f82791b0c9726616832382e0af8d895d99.tar.xz
receive-pack: turn on connectivity progress
When we receive a large push, the server side of the connection may spend a lot of time (30s or more for a full push of linux.git) walking the object graph without producing any output. Let's give the user some indication that we're actually working. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/receive-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index d309109abb..7db1639279 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1342,6 +1342,7 @@ static void execute_commands(struct command *commands,
data.cmds = commands;
data.si = si;
opt.err_fd = err_fd;
+ opt.progress = err_fd && !quiet;
if (check_connected(iterate_receive_command_list, &data, &opt))
set_connectivity_errors(commands, si);