@matheusbsbs / matheus-bagliano / commits / 7298bcc573

builtin/bundle: have unbundle check for repo before opening its bundle

The `git bundle unbundle` subcommand requires a repository to unbundle the contents into. As thus, the subcommand checks whether we have a startup repository in the first place, and if not it dies. This check happens after we have already opened the bundle though. This causes a segfault when running outside of a repository starting with c8aed5e8da (repository: stop setting SHA1 as the default object hash, 2024-05-07) because we have no hash function set up, but we do try to parse refs advertised by the bundle's header. The next commit will fix that underlying issue by defaulting to the SHA1 object format for bundles, which will also fix the described segfault here. But as we know that we will die anyway, we can do better than that and avoid some vain work by moving the check for a repository before we try to open the bundle. Reported-by: ArcticLampyrid <ArcticLampyrid@outlook.com> Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Aug 13, 2024 at 11:18 UTC 7298bcc573f8e022854b1811a9a7413281da05ea

2 files changed +10 -2

builtin/bundle.c

+3 -2

@@ -207,12 +207,13 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix)

207 builtin_bundle_unbundle_usage, options, &bundle_file);

208 /* bundle internals use argv[1] as further parameters */

209

210 + if (!startup_info->have_repository)

211 + die(_("Need a repository to unbundle."));

212 +

213 if ((bundle_fd = open_bundle(bundle_file, &header, NULL)) < 0) {

214 ret = 1;

215 goto cleanup;

216 }

214 - if (!startup_info->have_repository)

215 - die(_("Need a repository to unbundle."));

217 if (progress)

218 strvec_pushl(&extra_index_pack_args, "-v", "--progress-title",

219 _("Unbundling objects"), NULL);

t/t6020-bundle-misc.sh

@@ -652,4 +652,11 @@ test_expect_success 'send a bundle to standard output' '

652 test_cmp expect actual

653 '

654

655 +test_expect_success 'unbundle outside of a repository' '

656 + git bundle create some.bundle HEAD &&

657 + echo "fatal: Need a repository to unbundle." >expect &&

658 + nongit test_must_fail git bundle unbundle "$(pwd)/some.bundle" 2>err &&

659 + test_cmp expect err

660 +'

661 +

662 test_done