Skip to content

Commit 64edf4b

Browse files
dschoJunio C Hamano
authored andcommitted
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>
1 parent 81035bb commit 64edf4b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

builtin-archive.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
252252

253253
memset(&ar, 0, sizeof(ar));
254254
tree_idx = parse_archive_args(argc, argv, &ar);
255-
if (prefix == NULL)
256-
prefix = setup_git_directory();
257255

258256
argv += tree_idx;
259257
parse_treeish_arg(argv, &ar.args, prefix);

git.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
226226
{ "add", cmd_add, RUN_SETUP | NOT_BARE },
227227
{ "annotate", cmd_annotate, USE_PAGER },
228228
{ "apply", cmd_apply },
229-
{ "archive", cmd_archive },
229+
{ "archive", cmd_archive, RUN_SETUP },
230230
{ "blame", cmd_blame, RUN_SETUP },
231231
{ "branch", cmd_branch, RUN_SETUP },
232232
{ "cat-file", cmd_cat_file, RUN_SETUP },

0 commit comments

Comments
 (0)