git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>, John Cai <johncai86@gmail.com>
Subject: [PATCH 3/4] apply: remove the_repository global variable
Date: Tue, 24 Sep 2024 13:42:43 +0000	[thread overview]
Message-ID: <4ce463defa807fb99eef6ce7abcd758fc2065c13.1727185364.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1788.git.git.1727185364.gitgitgadget@gmail.com>

From: John Cai <johncai86@gmail.com>

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@gmail.com>
---
 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


  parent reply	other threads:[~2024-09-24 13:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-24 13:42 [PATCH 0/4] Remove the_repository global for am, annotate, apply, archive builtins John Cai via GitGitGadget
2024-09-24 13:42 ` [PATCH 1/4] git: pass in repo for RUN_SETUP_GENTLY John Cai via GitGitGadget
2024-09-24 15:24   ` shejialuo
2024-09-24 17:45     ` Junio C Hamano
2024-09-24 17:58   ` Junio C Hamano
2024-09-26 14:24   ` Patrick Steinhardt
2024-09-26 16:41     ` Junio C Hamano
2024-09-24 13:42 ` [PATCH 2/4] annotate: remove usage of the_repository global John Cai via GitGitGadget
2024-09-24 13:42 ` John Cai via GitGitGadget [this message]
2024-09-24 18:32   ` [PATCH 3/4] apply: remove the_repository global variable Junio C Hamano
2024-09-24 18:50     ` Junio C Hamano
2024-09-26 18:59     ` John Cai
2024-09-26 19:17       ` Junio C Hamano
2024-09-24 13:42 ` [PATCH 4/4] archive: " John Cai via GitGitGadget
2024-09-24 18:35   ` Junio C Hamano
2024-09-30 17:40 ` [PATCH v2 0/4] Remove the_repository global for am, annotate, apply, archive builtins John Cai via GitGitGadget
2024-09-30 17:40   ` [PATCH v2 1/4] git: pass in repo for RUN_SETUP_GENTLY John Cai via GitGitGadget
2024-09-30 19:40     ` Junio C Hamano
2024-10-01  4:21     ` shejialuo
2024-09-30 17:40   ` [PATCH v2 2/4] annotate: remove usage of the_repository global John Cai via GitGitGadget
2024-09-30 19:43     ` Junio C Hamano
2024-09-30 17:40   ` [PATCH v2 3/4] apply: remove the_repository global variable John Cai via GitGitGadget
2024-09-30 20:06     ` Junio C Hamano
2024-10-01  4:58       ` shejialuo
2024-10-01 12:32         ` Patrick Steinhardt
2024-10-01 13:40           ` shejialuo
2024-10-01 14:09             ` Patrick Steinhardt
2024-10-01 17:10           ` Junio C Hamano
2024-10-03 18:28             ` johncai86
2024-09-30 17:40   ` [PATCH v2 4/4] archive: " John Cai via GitGitGadget
2024-09-30 20:01     ` Junio C Hamano
2024-10-04 20:05       ` johncai86
2024-10-05  3:30   ` [PATCH v3 0/3] Remove the_repository global for am, annotate, apply, archive builtins John Cai via GitGitGadget
2024-10-05  3:30     ` [PATCH v3 1/3] git: pass in repo to builtin based on setup_git_directory_gently John Cai via GitGitGadget
2024-10-05  6:51       ` shejialuo
2024-10-05  3:30     ` [PATCH v3 2/3] annotate: remove usage of the_repository global John Cai via GitGitGadget
2024-10-05  3:30     ` [PATCH v3 3/3] archive: remove the_repository global variable John Cai via GitGitGadget
2024-10-05  7:13       ` shejialuo
2024-10-10 18:27         ` johncai86
2024-10-10 21:13     ` [PATCH v4 0/3] Remove the_repository global for am, annotate, apply, archive builtins John Cai via GitGitGadget
2024-10-10 21:13       ` [PATCH v4 1/3] git: pass in repo to builtin based on setup_git_directory_gently John Cai via GitGitGadget
2024-10-10 21:13       ` [PATCH v4 2/3] annotate: remove usage of the_repository global John Cai via GitGitGadget
2024-10-10 21:13       ` [PATCH v4 3/3] archive: remove the_repository global variable John Cai via GitGitGadget
2024-10-11 17:47       ` [PATCH v4 0/3] Remove the_repository global for am, annotate, apply, archive builtins Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4ce463defa807fb99eef6ce7abcd758fc2065c13.1727185364.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johncai86@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).