threads / patch / 7520

patchMake it possible to run git archive --remote without a git directory.

Subject: [PATCH] Make it possible to run git archive --remote without a git directory.

## tl;dr

3 messages between Apr 5, 2007 and Apr 5, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Simon Hausmann· Apr 5, 2007, 08:12 UTC · lore

Try a gentle git directory setup for the archive command that remains fatal for the local case but permits operation without a local git repository when using --remote. If in the remote case a git directory is present it will then still be used for proxy settings, but that is optional now.

Signed-off-by: Simon Hausmann <simon@lst.de>
---
 builtin-archive.c |    6 ++++++
 git.c             |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
Show changes to 2 files +7 −1

builtin-archive.c, git.c

diff --git a/builtin-archive.c b/builtin-archive.c
index 2fae885..434fec7 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -243,11 +243,17 @@ int cmd_archive(int argc, const char **argv, const char 
*prefix)
 	struct archiver ar;
 	int tree_idx;
 	const char *remote = NULL;
+	int nongit = 0;
+
+	prefix = setup_git_directory_gently(&nongit);
 
 	remote = extract_remote_arg(&argc, argv);
 	if (remote)
 		return run_remote_archiver(remote, argc, argv);
 
+	if (nongit)
+		die("Not a git repository");
+
 	setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
 	memset(&ar, 0, sizeof(ar));
diff --git a/git.c b/git.c
index 5b1bc2a..33dd4d3 100644
--- a/git.c
+++ b/git.c
@@ -226,7 +226,7 @@ static void handle_internal_command(int argc, const char 
**argv, char **envp)
 		{ "add", cmd_add, RUN_SETUP | NOT_BARE },
 		{ "annotate", cmd_annotate, USE_PAGER },
 		{ "apply", cmd_apply },
-		{ "archive", cmd_archive, RUN_SETUP },
+		{ "archive", cmd_archive },
 		{ "blame", cmd_blame, RUN_SETUP },
 		{ "branch", cmd_branch, RUN_SETUP },
 		{ "bundle", cmd_bundle },

-- 
1.5.1
Simon Hausmann· Apr 5, 2007, 19:47 UTC · re: Simon Hausmann · lore

Re: [PATCH] Make it possible to run git archive --remote without a git directory.

On Thursday 05 April 2007 10:12:37 Simon Hausmann wrote: [...]

Sorry, for replying to my own mail, but attached is a revised patch that also allows --list to work without a git dir, as pointed out by Jeff Garzik.

Would be nice if the patch could be applied to git :)
Simon
From f893a0080d0af6d1f02c05de79d21598f614fa4b Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon@lst.de>
Date: Thu, 5 Apr 2007 10:03:19 +0200
Subject: [PATCH] Make it possible to run git-archive --remote and --list without a git directory.

Try a gentle git directory setup for the archive command that remains fatal for the local case but permits operation without a local git repository when using --remote. If in the remote case a git directory is present it will then still be used for proxy settings, but that is optional now.

Signed-off-by: Simon Hausmann <simon@lst.de>
---
 builtin-archive.c |    6 ++++++
 git.c             |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
Show changes to 2 files +7 −1

builtin-archive.c, git.c

diff --git a/builtin-archive.c b/builtin-archive.c
index 2fae885..8c2fe49 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -243,6 +243,9 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 	struct archiver ar;
 	int tree_idx;
 	const char *remote = NULL;
+	int nongit = 0;
+
+	prefix = setup_git_directory_gently(&nongit);
 
 	remote = extract_remote_arg(&argc, argv);
 	if (remote)
@@ -253,6 +256,9 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 	memset(&ar, 0, sizeof(ar));
 	tree_idx = parse_archive_args(argc, argv, &ar);
 
+	if (nongit)
+		die("Not a git repository");
+
 	argv += tree_idx;
 	parse_treeish_arg(argv, &ar.args, prefix);
 	parse_pathspec_arg(argv + 1, &ar.args);
diff --git a/git.c b/git.c
index 5b1bc2a..33dd4d3 100644
--- a/git.c
+++ b/git.c
@@ -226,7 +226,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "add", cmd_add, RUN_SETUP | NOT_BARE },
 		{ "annotate", cmd_annotate, USE_PAGER },
 		{ "apply", cmd_apply },
-		{ "archive", cmd_archive, RUN_SETUP },
+		{ "archive", cmd_archive },
 		{ "blame", cmd_blame, RUN_SETUP },
 		{ "branch", cmd_branch, RUN_SETUP },
 		{ "bundle", cmd_bundle },

-- 
1.5.1
René Scharfe· Apr 5, 2007, 23:21 UTC · re: Simon Hausmann · lore

Re: [PATCH] Make it possible to run git archive --remote without a git directory.

Simon Hausmann schrieb:
Show 7 quoted lines
> On Thursday 05 April 2007 10:12:37 Simon Hausmann wrote:
> [...]
> 
> Sorry, for replying to my own mail, but attached is a revised patch that also 
> allows --list to work without a git dir, as pointed out by Jeff Garzik.
> 
> Would be nice if the patch could be applied to git :)

Oh, saw your patch just now -- of course only _after_ I sent mine. Still, I like my patch better because it reverts the code to a known good version and it adds a test case. And maybe a little bit because it's mine. ;-)

I forgot addressing the 'git-archive --remote' case, though. The code is fine (i.e. --remote works outside a repo with the patch applied), but a test case for that is missing. Care to provide this missing piece on top of my patch?

Thanks, René

← back to recent threads