From 391b1f2003c425773c01799969368a517375b1a4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 1 May 2012 04:42:24 -0400 Subject: teach send-pack about --[no-]progress The send_pack function gets a "progress" flag saying "yes, definitely show progress" or "no, definitely do not show progress". This gets set properly by transport_push when send_pack is called directly. However, when the send-pack command is executed separately (as it is for the remote-curl helper), there is no way to tell it "definitely do this". As a result, we do not properly respect "git push --no-progress" for smart-http remotes; you will still get progress if stderr is a tty. This patch teaches send-pack --progress and --no-progress, and teaches remote-curl to pass the appropriate option to override send-pack's isatty check. This fixes the --no-progress case above, and as a bonus, also makes "git push --progress" work when stderr is not a tty. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- remote-curl.c | 1 + 1 file changed, 1 insertion(+) (limited to 'remote-curl.c') diff --git a/remote-curl.c b/remote-curl.c index d159fe7f3..e5e9490be 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -774,6 +774,7 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs) argv[argc++] = "--quiet"; else if (options.verbosity > 1) argv[argc++] = "--verbose"; + argv[argc++] = options.progress ? "--progress" : "--no-progress"; argv[argc++] = url; for (i = 0; i < nr_spec; i++) argv[argc++] = specs[i]; -- cgit v1.2.1