diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:13:55 -0700 |
| commit | 4c732da91cea2156979a0cc73cc772ef024e7b9a (patch) | |
| tree | 566b6d7db549e6720af66801fb03fdae906b8fe6 /remote-curl.c | |
| parent | Merge branch 'nd/columns' (diff) | |
| parent | t5541: test more combinations of --progress (diff) | |
| download | tgif-4c732da91cea2156979a0cc73cc772ef024e7b9a.tar.xz | |
Merge branch 'jk/maint-push-progress'
"git push" over smart-http lost progress output and this resurrects it.
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 08962214db..04a9d6277d 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]; |