summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-18 22:48:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-18 22:48:06 (GMT)
commitd54fe394acbad36e9d0fd960d5e10f2769a8041b (patch)
treeffd71f86a9a602f4b52d2e518a530d5a2de2921f /tree-diff.c
parent304de2d2d6afc7500fe9b8f2e22dd0a16a902d8b (diff)
parent0c66d6be4f888096865b8f3d5fdc00c83e4ecc3f (diff)
downloadgit-d54fe394acbad36e9d0fd960d5e10f2769a8041b.zip
git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.gz
git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.bz2
Merge branch 'ar/diff'
* ar/diff: Add tests for --quiet option of diff programs try-to-simplify-commit: use diff-tree --quiet machinery. revision.c: explain what tree_difference does Teach --quiet to diff backends. diff --quiet Remove unused diffcore_std_no_resolve Allow git-diff exit with codes similar to diff(1)
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tree-diff.c b/tree-diff.c
index f89b9d3..3940962 100644
--- 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;