зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
f245194f9a
Коммит
90b1994170
|
@ -537,7 +537,7 @@ static int reopen_stdout(struct commit *commit, struct rev_info *rev)
|
|||
|
||||
get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
|
||||
|
||||
if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
|
||||
if (!DIFF_OPT_TST(&rev->diffopt, QUICK))
|
||||
fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
|
||||
|
||||
if (freopen(filename.buf, "w", stdout) == NULL)
|
||||
|
|
|
@ -320,7 +320,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||
memset(&info, 0, sizeof(info));
|
||||
info.revs = &revs;
|
||||
|
||||
quiet = DIFF_OPT_TST(&revs.diffopt, QUIET);
|
||||
quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
|
||||
for (i = 1 ; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
4
diff.c
4
diff.c
|
@ -2452,7 +2452,7 @@ int diff_setup_done(struct diff_options *options)
|
|||
* to have found. It does not make sense not to return with
|
||||
* exit code in such a case either.
|
||||
*/
|
||||
if (DIFF_OPT_TST(options, QUIET)) {
|
||||
if (DIFF_OPT_TST(options, QUICK)) {
|
||||
options->output_format = DIFF_FORMAT_NO_OUTPUT;
|
||||
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
|
||||
}
|
||||
|
@ -2643,7 +2643,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
else if (!strcmp(arg, "--exit-code"))
|
||||
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
|
||||
else if (!strcmp(arg, "--quiet"))
|
||||
DIFF_OPT_SET(options, QUIET);
|
||||
DIFF_OPT_SET(options, QUICK);
|
||||
else if (!strcmp(arg, "--ext-diff"))
|
||||
DIFF_OPT_SET(options, ALLOW_EXTERNAL);
|
||||
else if (!strcmp(arg, "--no-ext-diff"))
|
||||
|
|
2
diff.h
2
diff.h
|
@ -55,7 +55,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
|
|||
#define DIFF_OPT_COLOR_DIFF (1 << 8)
|
||||
#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
|
||||
#define DIFF_OPT_HAS_CHANGES (1 << 10)
|
||||
#define DIFF_OPT_QUIET (1 << 11)
|
||||
#define DIFF_OPT_QUICK (1 << 11)
|
||||
#define DIFF_OPT_NO_INDEX (1 << 12)
|
||||
#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
|
||||
#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
|
||||
|
|
|
@ -791,7 +791,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
|
|||
revs->ignore_merges = 1;
|
||||
revs->simplify_history = 1;
|
||||
DIFF_OPT_SET(&revs->pruning, RECURSIVE);
|
||||
DIFF_OPT_SET(&revs->pruning, QUIET);
|
||||
DIFF_OPT_SET(&revs->pruning, QUICK);
|
||||
revs->pruning.add_remove = file_add_remove;
|
||||
revs->pruning.change = file_change;
|
||||
revs->lifo = 1;
|
||||
|
|
|
@ -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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче