From 64edf4b2eb19e5b94eda60c0e21d85e45602a8f1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 3 Mar 2007 17:14:25 +0100 Subject: [PATCH] builtin-archive: use RUN_SETUP It used to roll its own setup. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-archive.c | 2 -- git.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin-archive.c b/builtin-archive.c index f613ac2516..5265764b6f 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 45265f14d0..660b0a6dc2 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 },