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
This commit is contained in:
@ -1,3 +1,4 @@
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
#include "builtin.h"
|
||||
#include "advice.h"
|
||||
#include "branch.h"
|
||||
@ -1956,7 +1957,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
|
||||
return ret;
|
||||
}
|
||||
|
||||
int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||
int cmd_checkout(int argc,
|
||||
const char **argv,
|
||||
const char *prefix,
|
||||
struct repository *repo UNUSED)
|
||||
{
|
||||
struct checkout_opts opts = CHECKOUT_OPTS_INIT;
|
||||
struct option *options;
|
||||
@ -2003,7 +2007,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||
checkout_usage);
|
||||
}
|
||||
|
||||
int cmd_switch(int argc, const char **argv, const char *prefix)
|
||||
int cmd_switch(int argc,
|
||||
const char **argv,
|
||||
const char *prefix,
|
||||
struct repository *repo UNUSED)
|
||||
{
|
||||
struct checkout_opts opts = CHECKOUT_OPTS_INIT;
|
||||
struct option *options = NULL;
|
||||
@ -2039,7 +2046,10 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
|
||||
switch_branch_usage);
|
||||
}
|
||||
|
||||
int cmd_restore(int argc, const char **argv, const char *prefix)
|
||||
int cmd_restore(int argc,
|
||||
const char **argv,
|
||||
const char *prefix,
|
||||
struct repository *repo UNUSED)
|
||||
{
|
||||
struct checkout_opts opts = CHECKOUT_OPTS_INIT;
|
||||
struct option *options;
|
||||
|
Reference in New Issue
Block a user