Merge branch 'ar/diff'

diff --git a/tree-diff.c b/tree-diff.c
index f89b9d31e4542724ff44b6f3c3bc6ae3adcaa1a6..3940962e79a5094e61270cd951d5d37c307d11a9 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -163,6 +163,8 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, stru
        int baselen = strlen(base);
 
        while (t1->size | t2->size) {
+               if (opt->quiet && opt->has_changes)
+                       break;
                if (opt->nr_paths && t1->size && !interesting(t1, base, baselen, opt)) {
                        update_tree_entry(t1);
                        continue;