From: John Cai <johncai86@xxxxxxxxx>
Remove the_repository global variable in favor of the repository
argument that gets passed in through the builtin function.
Signed-off-by: John Cai <johncai86@xxxxxxxxx>
---
builtin/apply.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 84f1863d3ac..d0bafbec7e4 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,4 +1,3 @@
-#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "gettext.h"
#include "hash.h"
@@ -12,14 +11,14 @@ static const char * const apply_usage[] = {
int cmd_apply(int argc,
const char **argv,
const char *prefix,
- struct repository *repo UNUSED)
+ struct repository *repo)
{
int force_apply = 0;
int options = 0;
int ret;
struct apply_state state;
- if (init_apply_state(&state, the_repository, prefix))
+ if (init_apply_state(&state, repo, prefix))
exit(128);
/*
@@ -28,8 +27,8 @@ int cmd_apply(int argc,
* is worth the effort.
* cf. https://lore.kernel.org/git/xmqqcypfcmn4.fsf@gitster.g/
*/
- if (!the_hash_algo)
- repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
+ if (!repo->hash_algo)
+ repo_set_hash_algo(repo, GIT_HASH_SHA1);
argc = apply_parse_options(argc, argv,
&state, &force_apply, &options,
--
gitgitgadget
