builtin/pack-refs: stop using `the_repository`
Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/pack-refs.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_pack_refs()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Usman Akinyemi committed
Mar 8, 2025 at 05:05 UTC
72fe8bfac832a1f1b9b7cdc4efa793c48e13933e
2 files changed
+10
-5
builtin/pack-refs.c
+3
-5
@@ -1,5 +1,3 @@
1
-#define USE_THE_REPOSITORY_VARIABLE
2
-
1
#include "builtin.h"
2
#include "config.h"
3
#include "gettext.h"
@@ -15,7 +13,7 @@ static char const * const pack_refs_usage[] = {
13
int cmd_pack_refs(int argc,
14
const char **argv,
15
const char *prefix,
18
- struct repository *repo UNUSED)
16
+ struct repository *repo)
17
{
18
struct ref_exclusions excludes = REF_EXCLUSIONS_INIT;
19
struct string_list included_refs = STRING_LIST_INIT_NODUP;
@@ -39,7 +37,7 @@ int cmd_pack_refs(int argc,
37
N_("references to exclude")),
38
OPT_END(),
39
};
42
- git_config(git_default_config, NULL);
40
+ repo_config(repo, git_default_config, NULL);
41
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
42
usage_with_options(pack_refs_usage, opts);
43
@@ -52,7 +50,7 @@ int cmd_pack_refs(int argc,
50
if (!pack_refs_opts.includes->nr)
51
string_list_append(pack_refs_opts.includes, "refs/tags/*");
52
55
- ret = refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts);
53
+ ret = refs_pack_refs(get_main_ref_store(repo), &pack_refs_opts);
54
55
clear_ref_exclusions(&excludes);
56
string_list_clear(&included_refs, 0);
t/t0610-reftable-basics.sh
+7
@@ -14,6 +14,13 @@ export GIT_TEST_DEFAULT_REF_FORMAT
14
15
INVALID_OID=$(test_oid 001)
16
17
+test_expect_success 'pack-refs does not crash with -h' '
18
+ test_expect_code 129 git pack-refs -h >usage &&
19
+ test_grep "[Uu]sage: git pack-refs " usage &&
20
+ test_expect_code 129 nongit git pack-refs -h >usage &&
21
+ test_grep "[Uu]sage: git pack-refs " usage
22
+'
23
+
24
test_expect_success 'init: creates basic reftable structures' '
25
test_when_finished "rm -rf repo" &&
26
git init repo &&