Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index f8215ea7072af34072a73221273c1b9cdadd18d6..24cb2d7f84064d7833fa04f33aeca6eafc8b931d 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -59,7 +59,7 @@ static const char diff_tree_usage[] =
 "  --root        include the initial commit as diff against /dev/null\n"
 COMMON_DIFF_OPTIONS_HELP;
 
-int cmd_diff_tree(int argc, const char **argv, char **envp)
+int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 {
        int nr_sha1;
        char line[1000];
@@ -67,7 +67,7 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
        static struct rev_info *opt = &log_tree_opt;
        int read_stdin = 0;
 
-       init_revisions(opt, setup_git_directory());
+       init_revisions(opt, prefix);
        git_config(git_default_config); /* no "diff" UI options */
        nr_sha1 = 0;
        opt->abbrev = 0;