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-tree.c | |
| parent | The eleventh batch (diff) | |
| download | git-9b1cb5070ffb581798763eaee85cec10da969e90.tar.gz git-9b1cb5070ffb581798763eaee85cec10da969e90.zip | |
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-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 9bca9b5f33..8751d86fd0 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -526,7 +526,10 @@ static int real_merge(struct merge_tree_options *o, return !result.clean; /* result.clean < 0 handled above */ } -int cmd_merge_tree(int argc, const char **argv, const char *prefix) +int cmd_merge_tree(int argc, + const char **argv, + const char *prefix, + struct repository *repo UNUSED) { struct merge_tree_options o = { .show_messages = -1 }; struct strvec xopts = STRVEC_INIT; |