diff options
| author | Jeff King <peff@peff.net> | 2010-10-17 02:37:03 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-18 16:20:19 -0700 |
| commit | d7c411b71d727600d2f031fec9723873ae93c1c7 (patch) | |
| tree | cef120584580323d54a0e24d0006bf8f4df22a95 /builtin/send-pack.c | |
| parent | 8ac3ed27d4ca6b3c89c51e4d90e2e7be5de5ab15 (diff) | |
| download | git-d7c411b71d727600d2f031fec9723873ae93c1c7.tar.gz git-d7c411b71d727600d2f031fec9723873ae93c1c7.tar.xz | |
push: pass --progress down to git-pack-objects
When pushing via builtin transports (like file://, git://), the
underlying transport helper (in this case, git-pack-objects) did not get
the --progress option, even if it was passed to git push.
Fix this, and update the tests to reflect this.
Note that according to the git-pack-objects documentation, we can safely
apply the usual --progress semantics for the transport commands like
clone and fetch (and for pushing over other smart transports).
Reported-by: Chase Brammer <cbrammer@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 481602d8a..efd9be67b 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; |