diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 17:08:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 17:08:54 (GMT) |
| commit | 25047b88965c8954e0599fe20c88b6a03c3ee506 (patch) | |
| tree | 16dba9b704b47aab166e20e36b1918f5e0a24493 /remote-curl.c | |
| parent | 454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd (diff) | |
| parent | e304aeba20d6f26cb95c022704440a36ef309075 (diff) | |
| download | git-25047b88965c8954e0599fe20c88b6a03c3ee506.zip git-25047b88965c8954e0599fe20c88b6a03c3ee506.tar.gz git-25047b88965c8954e0599fe20c88b6a03c3ee506.tar.bz2 | |
Merge branch 'jk/maint-push-progress' into maint
"git push" over smart-http lost progress output a few releases ago.
By Jeff King
* jk/maint-push-progress:
t5541: test more combinations of --progress
teach send-pack about --[no-]progress
send-pack: show progress when isatty(2)
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remote-curl.c b/remote-curl.c index 0896221..04a9d62 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -782,6 +782,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]; |