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>
Subject: [PATCH v2 0/4] Remove the_repository global for am, annotate, apply, archive builtins
Date: Mon, 30 Sep 2024 17:40:26 +0000	[thread overview]
Message-ID: <pull.1788.v2.git.git.1727718030.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1788.git.git.1727185364.gitgitgadget@gmail.com>

Remove the_repository global variable for the annotate, apply, and archive
bulitins.

Changes since V1:

 * in patch 1, only pass in repo to the bulitin if the repo exists

John Cai (4):
  git: pass in repo for RUN_SETUP_GENTLY
  annotate: remove usage of the_repository global
  apply: remove the_repository global variable
  archive: remove the_repository global variable

 builtin/annotate.c |  5 ++---
 builtin/apply.c    |  9 ++++-----
 builtin/archive.c  |  5 ++---
 git.c              | 11 +++++++++--
 4 files changed, 17 insertions(+), 13 deletions(-)


base-commit: 3857aae53f3633b7de63ad640737c657387ae0c6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1788%2Fjohn-cai%2Fjc%2Fremove-global-repo-a-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1788/john-cai/jc/remove-global-repo-a-v2
Pull-Request: https://github.com/git/git/pull/1788

Range-diff vs v1:

 1:  eceb2d835be ! 1:  5d72c31c6f3 git: pass in repo for RUN_SETUP_GENTLY
     @@ Commit message
          Signed-off-by: John Cai <johncai86@gmail.com>
      
       ## git.c ##
     +@@ git.c: static int handle_alias(int *argcp, const char ***argv)
     + 
     + static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct repository *repo)
     + {
     +-	int status, help;
     ++	int status, help, repo_exists;
     + 	struct stat st;
     + 	const char *prefix;
     + 	int run_setup = (p->option & (RUN_SETUP | RUN_SETUP_GENTLY));
     +@@ git.c: static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct
     + 
     + 	if (run_setup & RUN_SETUP) {
     + 		prefix = setup_git_directory();
     ++		repo_exists = 1;
     + 	} else if (run_setup & RUN_SETUP_GENTLY) {
     + 		int nongit_ok;
     + 		prefix = setup_git_directory_gently(&nongit_ok);
     ++
     ++		if (!nongit_ok)
     ++			repo_exists = 1;
     + 	} else {
     + 		prefix = NULL;
     + 	}
      @@ git.c: static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct
       	trace2_cmd_name(p->cmd);
       
     @@ git.c: static int run_builtin(struct cmd_struct *p, int argc, const char **argv,
      +	status = p->fn(argc,
      +		       argv,
      +		       prefix,
     -+		       ((p->option & RUN_SETUP) || (p->option & RUN_SETUP_GENTLY))? repo : NULL);
     ++		       repo_exists ? repo : NULL);
       	validate_cache_entries(repo->index);
       
       	if (status)
 2:  1bf2b017dd3 = 2:  2a29d113815 annotate: remove usage of the_repository global
 3:  4ce463defa8 = 3:  d64955a2e27 apply: remove the_repository global variable
 4:  f6c32ec609c = 4:  857291d7f7d archive: remove the_repository global variable

-- 
gitgitgadget

  parent reply	other threads:[~2024-09-30 17:40 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 ` John Cai via GitGitGadget [this message]
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=pull.1788.v2.git.git.1727718030.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).