diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:00 -0800 |
| commit | 0510480510b181216d565ebcedea471d50c200b1 (patch) | |
| tree | bf7beeb2fc8eca0e3692aedd15d9589b3de8ea86 /builtin/send-pack.c | |
| parent | ba0254cb32537b7a7e92854a51256475ee83cdda (diff) | |
| parent | d7c411b71d727600d2f031fec9723873ae93c1c7 (diff) | |
| download | git-0510480510b181216d565ebcedea471d50c200b1.tar.gz | |
Merge branch 'jk/push-progress'
* jk/push-progress:
push: pass --progress down to git-pack-objects
t5523-push-upstream: test progress messages
t5523-push-upstream: add function to ensure fresh upstream repo
test_terminal: ensure redirections work reliably
test_terminal: catch use without TTY prerequisite
test-lib: allow test code to check the list of declared prerequisites
tests: test terminal output to both stdout and stderr
tests: factor out terminal handling from t7006
Diffstat (limited to 'builtin/send-pack.c')
| -rw-r--r-- | builtin/send-pack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 8aa303158b..2cd1c40b70 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -48,6 +48,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext NULL, NULL, NULL, + NULL, }; struct child_process po; int i; @@ -59,6 +60,8 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext argv[i++] = "--delta-base-offset"; if (args->quiet) argv[i++] = "-q"; + if (args->progress) + argv[i++] = "--progress"; memset(&po, 0, sizeof(po)); po.argv = argv; po.in = -1; |