Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/bundle.h b/bundle.h
index 781e6f5c3a837ac65e6911ec5e0ae458b8b6a5c7..37c37d7f653c68ab6752fab8203b59783e2f5c40 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -18,8 +18,8 @@ struct bundle_header {
 
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
-int create_bundle(struct repository *r, struct bundle_header *header,
-                 const char *path, int argc, const char **argv);
+int create_bundle(struct repository *r, const char *path,
+                 int argc, const char **argv);
 int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
 #define BUNDLE_VERBOSE 1
 int unbundle(struct repository *r, struct bundle_header *header,