Merge branch 'jc/diff-prefix'

diff --git a/builtin-diff.c b/builtin-diff.c
index 266337b832a020b97ab59cefb4ea1f05404fd00b..52470c7f41b914932d404a5813e8ae156346beca 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -124,6 +124,8 @@ static int builtin_diff_index(struct rev_info *revs,
                        usage(builtin_diff_usage);
                argv++; argc--;
        }
+       if (!cached)
+               setup_work_tree();
        /*
         * Make sure there is one revision (i.e. pending object),
         * and there is no revision filtering parameters.
@@ -227,6 +229,7 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
            (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
                revs->combine_merges = revs->dense_combined_merges = 1;
 
+       setup_work_tree();
        if (read_cache() < 0) {
                perror("read_cache");
                return -1;