aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-03-03 17:14:25 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-03 12:26:50 -0800
commit64edf4b2eb19e5b94eda60c0e21d85e45602a8f1 (patch)
tree1c44f6ac0dbf2f30e3d75cdb02d46f45bbd65f02
parent81035bba0a15f9c8c28016c131dda864b70774f3 (diff)
downloadgit-64edf4b2eb19e5b94eda60c0e21d85e45602a8f1.tar.gz
git-64edf4b2eb19e5b94eda60c0e21d85e45602a8f1.tar.xz
builtin-archive: use RUN_SETUP
It used to roll its own setup. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-archive.c2
-rw-r--r--git.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/builtin-archive.c b/builtin-archive.c
index f613ac251..5265764b6 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -252,8 +252,6 @@ 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);
diff --git a/git.c b/git.c
index 45265f14d..660b0a6dc 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 },
+ { "archive", cmd_archive, RUN_SETUP },
{ "blame", cmd_blame, RUN_SETUP },
{ "branch", cmd_branch, RUN_SETUP },
{ "cat-file", cmd_cat_file, RUN_SETUP },