Merge branch 'sb/maint-octopus'

[git.git] / tree-diff.c

diff --git a/tree-diff.c b/tree-diff.c
index 7c526d33f4d5a5c625ff0524880526a817cdbd0f..7d745b44061955ced9ce4624a498647a1d8d32a5 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -286,7 +286,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru
        int baselen = strlen(base);
 
        for (;;) {
-               if (DIFF_OPT_TST(opt, QUIET) &&
+               if (DIFF_OPT_TST(opt, QUICK) &&
                    DIFF_OPT_TST(opt, HAS_CHANGES))
                        break;
                if (opt->nr_paths) {