diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-05-19 11:52:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-19 19:36:24 +0900 |
| commit | 6e7e50cc7b9beab495c579249ba411a348bbdca4 (patch) | |
| tree | 8a20c28a72bde252cee46563702f693bb882a330 | |
| parent | e6a380201e841b4e4aa0a7b9c1b65330cc90377f (diff) | |
setup: stop using `the_repository` in `verify_filename()`
Stop using `the_repository` in `verify_filename()` and instead accept
the repository as a parameter. The injection of `the_repository` is thus
bumped one level higher, where callers now pass it in explicitly.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/grep.c | 2 | ||||
| -rw-r--r-- | builtin/reset.c | 2 | ||||
| -rw-r--r-- | builtin/rev-parse.c | 4 | ||||
| -rw-r--r-- | revision.c | 2 | ||||
| -rw-r--r-- | setup.c | 5 | ||||
| -rw-r--r-- | setup.h | 3 |
6 files changed, 10 insertions, 8 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index e33285e5e6..b0e350cf89 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1163,7 +1163,7 @@ int cmd_grep(int argc, if (!seen_dashdash) { int j; for (j = i; j < argc; j++) - verify_filename(prefix, argv[j], j == i && allow_revs); + verify_filename(the_repository, prefix, argv[j], j == i && allow_revs); } parse_pathspec(&pathspec, 0, diff --git a/builtin/reset.c b/builtin/reset.c index 3590be57a5..1ac374d31b 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -285,7 +285,7 @@ static void parse_args(struct pathspec *pathspec, rev = *argv++; } else { /* Otherwise we treat this as a filename */ - verify_filename(prefix, argv[0], 1); + verify_filename(the_repository, prefix, argv[0], 1); } } diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 2fcd6851d1..8fdb75413d 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -749,7 +749,7 @@ int cmd_rev_parse(int argc, if (as_is) { if (show_file(arg, output_prefix) && as_is < 2) - verify_filename(prefix, arg, 0); + verify_filename(the_repository, prefix, arg, 0); continue; } @@ -1173,7 +1173,7 @@ int cmd_rev_parse(int argc, as_is = 1; if (!show_file(arg, output_prefix)) continue; - verify_filename(prefix, arg, 1); + verify_filename(the_repository, prefix, arg, 1); } strbuf_release(&buf); if (verify) { diff --git a/revision.c b/revision.c index 599b3a66c3..5d53244379 100644 --- a/revision.c +++ b/revision.c @@ -3067,7 +3067,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s * but the latter we have checked in the main loop. */ for (j = i; j < argc; j++) - verify_filename(revs->prefix, argv[j], j == i); + verify_filename(the_repository, revs->prefix, argv[j], j == i); strvec_pushv(&prune_data, argv + i); break; @@ -280,7 +280,8 @@ static int looks_like_pathspec(const char *arg) * diagnose_misspelt_rev == 0 for the next ones (because we already * saw a filename, there's not ambiguity anymore). */ -void verify_filename(const char *prefix, +void verify_filename(struct repository *repo, + const char *prefix, const char *arg, int diagnose_misspelt_rev) { @@ -288,7 +289,7 @@ void verify_filename(const char *prefix, die(_("option '%s' must come before non-option arguments"), arg); if (looks_like_pathspec(arg) || check_filename(prefix, arg)) return; - die_verify_filename(the_repository, prefix, arg, diagnose_misspelt_rev); + die_verify_filename(repo, prefix, arg, diagnose_misspelt_rev); } /* @@ -142,7 +142,8 @@ char *prefix_path(struct repository *repo, const char *prefix, int len, const ch char *prefix_path_gently(struct repository *repo, const char *prefix, int len, int *remaining, const char *path); int check_filename(const char *prefix, const char *name); -void verify_filename(const char *prefix, +void verify_filename(struct repository *repo, + const char *prefix, const char *name, int diagnose_misspelt_rev); void verify_non_filename(const char *prefix, const char *name); |