diff options
| author | John Cai <johncai86@gmail.com> | 2024-09-13 21:16:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-13 14:27:08 -0700 |
| commit | 9b1cb5070ffb581798763eaee85cec10da969e90 (patch) | |
| tree | c33af160245f49cfa7d6e4e797c928a7a9f749ed /builtin/merge-recursive.c | |
| parent | 4590f2e9412378c61eac95966709c78766d326ba (diff) | |
builtin: add a repository parameter for builtin functions
In order to reduce the usage of the global the_repository, add a
parameter to builtin functions that will get passed a repository
variable.
This commit uses UNUSED on most of the builtin functions, as subsequent
commits will modify the actual builtins to pass the repository parameter
down.
Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
| -rw-r--r-- | builtin/merge-recursive.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index e951b09805..2bd3fb0e55 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -21,7 +21,10 @@ static char *better_branch_name(const char *branch) return xstrdup(name ? name : branch); } -int cmd_merge_recursive(int argc, const char **argv, const char *prefix UNUSED) +int cmd_merge_recursive(int argc, + const char **argv, + const char *prefix UNUSED, + struct repository *repo UNUSED) { struct object_id bases[21]; unsigned bases_count = 0; |