aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-09-23 10:35:09 -0700
committerJunio C Hamano <gitster@pobox.com>2024-09-23 10:35:09 -0700
commitb8e318ea58a0502ff99f37032ee8ac536df4e730 (patch)
treeb93a691c66d28b299794cd97e87d8cd6bf655587 /builtin/bundle.c
parent0f41fd28f9677c6fb700dbc9643ad7d7f3c78f52 (diff)
parent836474560b653271a819c4de9fa60cb097df2067 (diff)
downloadgit-b8e318ea58a0502ff99f37032ee8ac536df4e730.tar.gz
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/bundle.c')
-rw-r--r--builtin/bundle.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/bundle.c b/builtin/bundle.c
index b858552ee6..127518c2a8 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "abspath.h"
#include "gettext.h"
@@ -5,7 +6,6 @@
#include "strvec.h"
#include "parse-options.h"
#include "pkt-line.h"
-#include "repository.h"
#include "bundle.h"
/*
@@ -228,7 +228,10 @@ cleanup:
return ret;
}
-int cmd_bundle(int argc, const char **argv, const char *prefix)
+int cmd_bundle(int argc,
+ const char **argv,
+ const char *prefix,
+ struct repository *repo UNUSED)
{
parse_opt_subcommand_fn *fn = NULL;
struct option options[] = {