summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-23 08:15:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-29 17:22:39 (GMT)
commit90b1994170900514a1ce7a3345e25cb7216915cc (patch)
tree69cc27ed550f73bd87b35cab88d76ab744780650 /diff-lib.c
parentf245194f9a13d5108c3a59fd4ab1770ae9fd5b65 (diff)
downloadgit-90b1994170900514a1ce7a3345e25cb7216915cc.zip
git-90b1994170900514a1ce7a3345e25cb7216915cc.tar.gz
git-90b1994170900514a1ce7a3345e25cb7216915cc.tar.bz2
diff: Rename QUIET internal option to QUICK
The option "QUIET" primarily meant "find if we have _any_ difference as quick as possible and report", which means we often do not even have to look at blobs if we know the trees are different by looking at the higher level (e.g. "diff-tree A B"). As a side effect, because there is no point showing one change that we happened to have found first, it also enables NO_OUTPUT and EXIT_WITH_STATUS options, making the end result look quiet. Rename the internal option to QUICK to reflect this better; it also makes grepping the source tree much easier, as there are other kinds of QUIET option everywhere. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c
index ad2a4cd..b7813af 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -73,7 +73,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
struct cache_entry *ce = active_cache[i];
int changed;
- if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
+ if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
break;
@@ -523,7 +523,7 @@ int index_differs_from(const char *def, int diff_flags)
init_revisions(&rev, NULL);
setup_revisions(0, NULL, &rev, def);
- DIFF_OPT_SET(&rev.diffopt, QUIET);
+ DIFF_OPT_SET(&rev.diffopt, QUICK);
DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
rev.diffopt.flags |= diff_flags;
run_diff_index(&rev, 1);