summaryrefslogtreecommitdiff
path: root/bundle.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-15 20:46:39 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-15 20:46:39 -0700
commit6323a14701a191546f95fb4ab8266abcfc97d32d (patch)
tree9db63897c7c84077e80230b764d99478c5ff1347 /bundle.h
parent3197bd850b193a0d182674ab9705cf4acdc313e3 (diff)
parentbe042aff24c8a17565934874f5d2eebd77ab2562 (diff)
downloadgit-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.h')
-rw-r--r--bundle.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundle.h b/bundle.h
index e2aedd60d6..c5a22c8d10 100644
--- a/bundle.h
+++ b/bundle.h
@@ -18,7 +18,8 @@ int read_bundle_header(const char *path, struct bundle_header *header);
int create_bundle(struct bundle_header *header, const char *path,
int argc, const char **argv);
int verify_bundle(struct bundle_header *header, int verbose);
-int unbundle(struct bundle_header *header, int bundle_fd);
+#define BUNDLE_VERBOSE 1
+int unbundle(struct bundle_header *header, int bundle_fd, int flags);
int list_bundle_refs(struct bundle_header *header,
int argc, const char **argv);