There's no need to pass a header struct to create_bundle(); it writes the header information directly to a descriptor (and does not report back details to the caller).
Signed-off-by: Jeff King <[email protected]> --- builtin/bundle.c | 3 +-- bundle.c | 4 ++-- bundle.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/bundle.c b/builtin/bundle.c index 9e9c65d9c6..1ea4bfdfc1 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -56,8 +56,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) } if (!startup_info->have_repository) die(_("Need a repository to create a bundle.")); - return !!create_bundle(the_repository, &header, - bundle_file, argc, argv); + return !!create_bundle(the_repository, bundle_file, argc, argv); } else if (!strcmp(cmd, "unbundle")) { if (!startup_info->have_repository) die(_("Need a repository to unbundle.")); diff --git a/bundle.c b/bundle.c index 37b1daa691..b45666c49b 100644 --- a/bundle.c +++ b/bundle.c @@ -424,8 +424,8 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) return ref_count; } -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) { struct lock_file lock = LOCK_INIT; int bundle_fd = -1; diff --git a/bundle.h b/bundle.h index 781e6f5c3a..37c37d7f65 100644 --- 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, -- 2.20.1.842.g8986705066
