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: shejialuo <shejialuo@gmail.com>, Patrick Steinhardt <ps@pks.im>,
	John Cai <johncai86@gmail.com>, John Cai <johncai86@gmail.com>
Subject: [PATCH v4 3/3] archive: remove the_repository global variable
Date: Thu, 10 Oct 2024 21:13:48 +0000	[thread overview]
Message-ID: <736212f34b5806de2fc12f5ebc5030bc71884cc7.1728594828.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1788.v4.git.git.1728594828.gitgitgadget@gmail.com>

From: John Cai <johncai86@gmail.com>

As part of the effort to get rid of global state due to the global
the_repository variable, replace the_repository with the repository
argument that gets passed down through the builtin function.

The repo might be NULL, but we should be safe in write_archive() because
it detects if we are outside of a repository and calls
setup_git_directory() which will error.

Signed-off-by: John Cai <johncai86@gmail.com>
---
 builtin/archive.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/builtin/archive.c b/builtin/archive.c
index dc926d1a3df..13ea7308c8b 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -2,7 +2,6 @@
  * Copyright (c) 2006 Franck Bui-Huu
  * Copyright (c) 2006 Rene Scharfe
  */
-#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "archive.h"
 #include "gettext.h"
@@ -79,7 +78,7 @@ static int run_remote_archiver(int argc, const char **argv,
 int cmd_archive(int argc,
 		const char **argv,
 		const char *prefix,
-		struct repository *repo UNUSED)
+		struct repository *repo)
 {
 	const char *exec = "git-upload-archive";
 	char *output = NULL;
@@ -110,7 +109,7 @@ int cmd_archive(int argc,
 
 	setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
-	ret = write_archive(argc, argv, prefix, the_repository, output, 0);
+	ret = write_archive(argc, argv, prefix, repo, output, 0);
 
 out:
 	free(output);
-- 
gitgitgadget

  parent reply	other threads:[~2024-10-10 21:13 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 ` [PATCH 3/4] apply: remove the_repository global variable John Cai via GitGitGadget
2024-09-24 18:32   ` 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       ` John Cai via GitGitGadget [this message]
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=736212f34b5806de2fc12f5ebc5030bc71884cc7.1728594828.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johncai86@gmail.com \
    --cc=ps@pks.im \
    --cc=shejialuo@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).