From: Jeff King Date: Fri, 15 Jul 2016 10:35:28 +0000 (-0400) Subject: receive-pack: turn on index-pack resolving progress X-Git-Tag: v2.10.0-rc0~60^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d06303bb9a6c3791ff67078b480a86cfd9b691ea;p=thirdparty%2Fgit.git receive-pack: turn on index-pack resolving progress When we receive a large push, the server side may have to spend a lot of CPU processing the incoming packfile. During the "receiving" phase, we are typically network bound, and the client is writing its own progress to the user. But during the delta resolution phase, we may spend minutes (e.g., for a full push of linux.git) without making any indication to the user that the connection has not hung. Let's ask index-pack to produce progress output for this phase (unless the client asked us to be quiet, of course). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index ce819209a5..de322bc491 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1547,6 +1547,8 @@ static const char *unpack(int err_fd, struct shallow_info *si) (uintmax_t)getpid(), hostname); + if (!quiet && err_fd) + argv_array_push(&child.args, "--show-resolving-progress"); if (fsck_objects) argv_array_pushf(&child.args, "--strict%s", fsck_msg_types.buf);