t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

diff --git a/builtin-archive.c b/builtin-archive.c
index 8ea6cb1efc4f988fb09051852f9e51fc88b5efd7..2fae885f5c27f73820824b612d41fd37ab91239d 100644 (file)
--- 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);