[PATCH 09/12] receive-pack: turn on index-pack resolving progress
- From
Jeff King <peff@peff.net>
- Date
- Jul 15, 2016, 10:35 UTC
- Message-ID
- <20160715103527.GI19271@sigill.intra.peff.net>
- In-Reply-To
- <20160715102506.GA23164@sigill.intra.peff.net>
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 <peff@peff.net> --- builtin/receive-pack.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index ce81920..de322bc 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);
-- 2.9.1.434.g748be50