diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-23 10:35:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-23 10:35:09 -0700 |
| commit | b8e318ea58a0502ff99f37032ee8ac536df4e730 (patch) | |
| tree | b93a691c66d28b299794cd97e87d8cd6bf655587 /builtin/describe.c | |
| parent | 0f41fd28f9677c6fb700dbc9643ad7d7f3c78f52 (diff) | |
| parent | 836474560b653271a819c4de9fa60cb097df2067 (diff) | |
| download | git-b8e318ea58a0502ff99f37032ee8ac536df4e730.tar.xz | |
Merge branch 'jc/pass-repo-to-builtins'
The convention to calling into built-in command implementation has
been updated to pass the repository, if known, together with the
prefix value.
* jc/pass-repo-to-builtins:
add: pass in repo variable instead of global the_repository
builtin: remove USE_THE_REPOSITORY for those without the_repository
builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
builtin: add a repository parameter for builtin functions
Diffstat (limited to 'builtin/describe.c')
| -rw-r--r-- | builtin/describe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 9a49a2c9b5..7330a77b38 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -1,3 +1,4 @@ +#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" #include "config.h" #include "environment.h" @@ -571,7 +572,10 @@ static int option_parse_exact_match(const struct option *opt, const char *arg, return 0; } -int cmd_describe(int argc, const char **argv, const char *prefix) +int cmd_describe(int argc, + const char **argv, + const char *prefix, + struct repository *repo UNUSED ) { int contains = 0; struct option options[] = { @@ -650,7 +654,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) argv_copy[i] = args.v[i]; argv_copy[args.nr] = NULL; - ret = cmd_name_rev(args.nr, argv_copy, prefix); + ret = cmd_name_rev(args.nr, argv_copy, prefix, the_repository); strvec_clear(&args); free(argv_copy); |