diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:39 -0700 |
| commit | 6323a14701a191546f95fb4ab8266abcfc97d32d (patch) | |
| tree | 9db63897c7c84077e80230b764d99478c5ff1347 /bundle.c | |
| parent | 3197bd850b193a0d182674ab9705cf4acdc313e3 (diff) | |
| parent | be042aff24c8a17565934874f5d2eebd77ab2562 (diff) | |
| download | git-6323a14701a191546f95fb4ab8266abcfc97d32d.tar.gz | |
Merge branch 'jc/maint-bundle-too-quiet' into maint
* jc/maint-bundle-too-quiet:
Teach progress eye-candy to fetch_refs_from_bundle()
Diffstat (limited to 'bundle.c')
| -rw-r--r-- | bundle.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -380,12 +380,15 @@ int create_bundle(struct bundle_header *header, const char *path, return 0; } -int unbundle(struct bundle_header *header, int bundle_fd) +int unbundle(struct bundle_header *header, int bundle_fd, int flags) { const char *argv_index_pack[] = {"index-pack", - "--fix-thin", "--stdin", NULL}; + "--fix-thin", "--stdin", NULL, NULL}; struct child_process ip; + if (flags & BUNDLE_VERBOSE) + argv_index_pack[3] = "-v"; + if (verify_bundle(header, 0)) return -1; memset(&ip, 0, sizeof(ip)); |