# [PATCH] Make it possible to run git archive --remote without a git directory. 3 messages from 2007-04-05 to 2007-04-05. Participants: Simon Hausmann, René Scharfe. Thread: https://gitlist.dev/t/7520 ## Simon Hausmann, 2007-04-05 08:12 Subject: [PATCH] Make it possible to run git archive --remote without a git directory. Message-ID: <200704051012.37361.simon@lst.de> URL: https://gitlist.dev/e/200704051012.37361.simon%40lst.de ``` 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 --- builtin-archive.c | 6 ++++++ git.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) 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, 2007-04-05 19:47 Subject: Re: [PATCH] Make it possible to run git archive --remote without a git directory. Message-ID: <200704052147.39255.simon@lst.de> URL: https://gitlist.dev/e/200704052147.39255.simon%40lst.de In-Reply-To: <200704051012.37361.simon@lst.de> ``` 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 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 --- builtin-archive.c | 6 ++++++ git.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) 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, 2007-04-05 23:21 Subject: Re: [PATCH] Make it possible to run git archive --remote without a git directory. Message-ID: <4615846C.9020705@lsrfire.ath.cx> URL: https://gitlist.dev/e/4615846C.9020705%40lsrfire.ath.cx In-Reply-To: <200704052147.39255.simon@lst.de> ``` Simon Hausmann schrieb: > 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é ```