diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
| commit | 3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 (patch) | |
| tree | efdba423f81c7c1a5c1e625a626d361a73165020 /diff-lib.c | |
| parent | 7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d (diff) | |
| parent | 97bf2a08095197f43b20b3bc1124552ae24d71bf (diff) | |
| download | git-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.tar.gz | |
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
* jc/1.7.0-diff-whitespace-only-status:
diff.c: fix typoes in comments
Make test case number unique
diff: Rename QUIET internal option to QUICK
diff: change semantics of "ignore whitespace" options
Conflicts:
diff.h
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index adf1c5fdee..349f612b61 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; @@ -507,7 +507,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); |