diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2007-04-05 22:55:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 14:10:10 -0700 |
| commit | 265d528032e55c48798266c538d3e6338cb1e2b6 (patch) | |
| tree | 5bc341347905668fc3f6bd673a6875ef8a009497 | |
| parent | 5850cb645d3ca44c3bc014f92672dae6394c0315 (diff) | |
| download | git-265d528032e55c48798266c538d3e6338cb1e2b6.tar.gz | |
Revert "builtin-archive: use RUN_SETUP"
Commit 64edf4b2 cleaned up the initialization of git-archive,
at the cost of 'git-archive --list' now requiring a git repo.
This patch reverts the cleanup and documents the requirement
for this particular dirtyness in a test.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-archive.c | 2 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/builtin-archive.c b/builtin-archive.c index 2fae885f5c..8ea6cb1efc 100644 --- a/builtin-archive.c +++ b/builtin-archive.c @@ -252,6 +252,8 @@ 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 (prefix == NULL) + prefix = setup_git_directory(); argv += tree_idx; parse_treeish_arg(argv, &ar.args, prefix); @@ -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 }, diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index ac835fe431..b4359df795 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -130,4 +130,8 @@ test_expect_success \ 'validate file contents with prefix' \ 'diff -r a e/prefix/a' +test_expect_success \ + 'git-archive --list outside of a git repo' \ + 'GIT_DIR=some/non-existing/directory git-archive --list' + test_done |