combine-diff: Honour -z option correctly.

diff --git a/diff-stages.c b/diff-stages.c
index 85170b21d632dbb490b28ad426069ce4e1011bc1..9968d6ce1c4b361962900040afdfe431e39deb61 100644 (file)
--- a/diff-stages.c
+++ b/diff-stages.c
@@ -55,6 +55,9 @@ int main(int ac, const char **av)
 {
        int stage1, stage2;
 
+       setup_git_directory();
+
+       git_config(git_diff_config);
        read_cache();
        diff_setup(&diff_options);
        while (1 < ac && av[1][0] == '-') {