Git 2.23

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 4883a435a9afc607618d34c9b61b218eeda7de45..1ea4bfdfc19868d9cb89bb7014c138f145f7dd67 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -20,21 +20,15 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
        struct bundle_header header;
        const char *cmd, *bundle_file;
        int bundle_fd = -1;
-       char buffer[PATH_MAX];
 
        if (argc < 3)
                usage(builtin_bundle_usage);
 
        cmd = argv[1];
-       bundle_file = argv[2];
+       bundle_file = prefix_filename(prefix, argv[2]);
        argc -= 2;
        argv += 2;
 
-       if (prefix && bundle_file[0] != '/') {
-               snprintf(buffer, sizeof(buffer), "%s/%s", prefix, bundle_file);
-               bundle_file = buffer;
-       }
-
        memset(&header, 0, sizeof(header));
        if (strcmp(cmd, "create") && (bundle_fd =
                                read_bundle_header(bundle_file, &header)) < 0)
@@ -46,7 +40,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
                        usage(builtin_bundle_usage);
                        return 1;
                }
-               if (verify_bundle(&header, 1))
+               if (verify_bundle(the_repository, &header, 1))
                        return 1;
                fprintf(stderr, _("%s is okay\n"), bundle_file);
                return 0;
@@ -62,11 +56,11 @@ 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(&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."));
-               return !!unbundle(&header, bundle_fd, 0) ||
+               return !!unbundle(the_repository, &header, bundle_fd, 0) ||
                        list_bundle_refs(&header, argc, argv);
        } else
                usage(builtin_bundle_usage);