diff: make struct diff_flags members lowercase
Now that the flags stored in struct diff_flags are being accessed directly and not through macros, change all struct members from being uppercase to lowercase. This conversion is done using the following semantic patch: @@ expression E; @@ - E.RECURSIVE + E.recursive @@ expression E; @@ - E.TREE_IN_RECURSIVE + E.tree_in_recursive @@ expression E; @@ - E.BINARY + E.binary @@ expression E; @@ - E.TEXT + E.text @@ expression E; @@ - E.FULL_INDEX + E.full_index @@ expression E; @@ - E.SILENT_ON_REMOVE + E.silent_on_remove @@ expression E; @@ - E.FIND_COPIES_HARDER + E.find_copies_harder @@ expression E; @@ - E.FOLLOW_RENAMES + E.follow_renames @@ expression E; @@ - E.RENAME_EMPTY + E.rename_empty @@ expression E; @@ - E.HAS_CHANGES + E.has_changes @@ expression E; @@ - E.QUICK + E.quick @@ expression E; @@ - E.NO_INDEX + E.no_index @@ expression E; @@ - E.ALLOW_EXTERNAL + E.allow_external @@ expression E; @@ - E.EXIT_WITH_STATUS + E.exit_with_status @@ expression E; @@ - E.REVERSE_DIFF + E.reverse_diff @@ expression E; @@ - E.CHECK_FAILED + E.check_failed @@ expression E; @@ - E.RELATIVE_NAME + E.relative_name @@ expression E; @@ - E.IGNORE_SUBMODULES + E.ignore_submodules @@ expression E; @@ - E.DIRSTAT_CUMULATIVE + E.dirstat_cumulative @@ expression E; @@ - E.DIRSTAT_BY_FILE + E.dirstat_by_file @@ expression E; @@ - E.ALLOW_TEXTCONV + E.allow_textconv @@ expression E; @@ - E.TEXTCONV_SET_VIA_CMDLINE + E.textconv_set_via_cmdline @@ expression E; @@ - E.DIFF_FROM_CONTENTS + E.diff_from_contents @@ expression E; @@ - E.DIRTY_SUBMODULES + E.dirty_submodules @@ expression E; @@ - E.IGNORE_UNTRACKED_IN_SUBMODULES + E.ignore_untracked_in_submodules @@ expression E; @@ - E.IGNORE_DIRTY_SUBMODULES + E.ignore_dirty_submodules @@ expression E; @@ - E.OVERRIDE_SUBMODULE_CONFIG + E.override_submodule_config @@ expression E; @@ - E.DIRSTAT_BY_LINE + E.dirstat_by_line @@ expression E; @@ - E.FUNCCONTEXT + E.funccontext @@ expression E; @@ - E.PICKAXE_IGNORE_CASE + E.pickaxe_ignore_case @@ expression E; @@ - E.DEFAULT_FOLLOW_RENAMES + E.default_follow_renames Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
committed by
Junio C Hamano
Junio C Hamano
parent
b2100e5291
commit
0d1e0e7801
170
diff.c
170
diff.c
@ -124,18 +124,18 @@ static int parse_dirstat_params(struct diff_options *options, const char *params
|
||||
for (i = 0; i < params.nr; i++) {
|
||||
const char *p = params.items[i].string;
|
||||
if (!strcmp(p, "changes")) {
|
||||
options->flags.DIRSTAT_BY_LINE = 0;
|
||||
options->flags.DIRSTAT_BY_FILE = 0;
|
||||
options->flags.dirstat_by_line = 0;
|
||||
options->flags.dirstat_by_file = 0;
|
||||
} else if (!strcmp(p, "lines")) {
|
||||
options->flags.DIRSTAT_BY_LINE = 1;
|
||||
options->flags.DIRSTAT_BY_FILE = 0;
|
||||
options->flags.dirstat_by_line = 1;
|
||||
options->flags.dirstat_by_file = 0;
|
||||
} else if (!strcmp(p, "files")) {
|
||||
options->flags.DIRSTAT_BY_LINE = 0;
|
||||
options->flags.DIRSTAT_BY_FILE = 1;
|
||||
options->flags.dirstat_by_line = 0;
|
||||
options->flags.dirstat_by_file = 1;
|
||||
} else if (!strcmp(p, "noncumulative")) {
|
||||
options->flags.DIRSTAT_CUMULATIVE = 0;
|
||||
options->flags.dirstat_cumulative = 0;
|
||||
} else if (!strcmp(p, "cumulative")) {
|
||||
options->flags.DIRSTAT_CUMULATIVE = 1;
|
||||
options->flags.dirstat_cumulative = 1;
|
||||
} else if (isdigit(*p)) {
|
||||
char *end;
|
||||
int permille = strtoul(p, &end, 10) * 10;
|
||||
@ -1481,7 +1481,7 @@ static void emit_rewrite_diff(const char *name_a,
|
||||
struct emit_callback ecbdata;
|
||||
struct strbuf out = STRBUF_INIT;
|
||||
|
||||
if (diff_mnemonic_prefix && o->flags.REVERSE_DIFF) {
|
||||
if (diff_mnemonic_prefix && o->flags.reverse_diff) {
|
||||
a_prefix = o->b_prefix;
|
||||
b_prefix = o->a_prefix;
|
||||
} else {
|
||||
@ -2729,7 +2729,7 @@ static void show_dirstat(struct diff_options *options)
|
||||
dir.alloc = 0;
|
||||
dir.nr = 0;
|
||||
dir.permille = options->dirstat_permille;
|
||||
dir.cumulative = options->flags.DIRSTAT_CUMULATIVE;
|
||||
dir.cumulative = options->flags.dirstat_cumulative;
|
||||
|
||||
changed = 0;
|
||||
for (i = 0; i < q->nr; i++) {
|
||||
@ -2755,7 +2755,7 @@ static void show_dirstat(struct diff_options *options)
|
||||
goto found_damage;
|
||||
}
|
||||
|
||||
if (options->flags.DIRSTAT_BY_FILE) {
|
||||
if (options->flags.dirstat_by_file) {
|
||||
/*
|
||||
* In --dirstat-by-file mode, we don't really need to
|
||||
* look at the actual file contents at all.
|
||||
@ -2830,7 +2830,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
|
||||
dir.alloc = 0;
|
||||
dir.nr = 0;
|
||||
dir.permille = options->dirstat_permille;
|
||||
dir.cumulative = options->flags.DIRSTAT_CUMULATIVE;
|
||||
dir.cumulative = options->flags.dirstat_cumulative;
|
||||
|
||||
changed = 0;
|
||||
for (i = 0; i < data->nr; i++) {
|
||||
@ -3117,7 +3117,7 @@ static void builtin_diff(const char *name_a,
|
||||
const char *line_prefix = diff_line_prefix(o);
|
||||
|
||||
diff_set_mnemonic_prefix(o, "a/", "b/");
|
||||
if (o->flags.REVERSE_DIFF) {
|
||||
if (o->flags.reverse_diff) {
|
||||
a_prefix = o->b_prefix;
|
||||
b_prefix = o->a_prefix;
|
||||
} else {
|
||||
@ -3141,7 +3141,7 @@ static void builtin_diff(const char *name_a,
|
||||
return;
|
||||
}
|
||||
|
||||
if (o->flags.ALLOW_TEXTCONV) {
|
||||
if (o->flags.allow_textconv) {
|
||||
textconv_one = get_textconv(one);
|
||||
textconv_two = get_textconv(two);
|
||||
}
|
||||
@ -3201,13 +3201,13 @@ static void builtin_diff(const char *name_a,
|
||||
header.len, 0);
|
||||
strbuf_reset(&header);
|
||||
goto free_ab_and_return;
|
||||
} else if (!o->flags.TEXT &&
|
||||
} else if (!o->flags.text &&
|
||||
( (!textconv_one && diff_filespec_is_binary(one)) ||
|
||||
(!textconv_two && diff_filespec_is_binary(two)) )) {
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
if (!one->data && !two->data &&
|
||||
S_ISREG(one->mode) && S_ISREG(two->mode) &&
|
||||
!o->flags.BINARY) {
|
||||
!o->flags.binary) {
|
||||
if (!oidcmp(&one->oid, &two->oid)) {
|
||||
if (must_show_header)
|
||||
emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
|
||||
@ -3236,7 +3236,7 @@ static void builtin_diff(const char *name_a,
|
||||
}
|
||||
emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
|
||||
strbuf_reset(&header);
|
||||
if (o->flags.BINARY)
|
||||
if (o->flags.binary)
|
||||
emit_binary_diff(o, &mf1, &mf2);
|
||||
else {
|
||||
strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
|
||||
@ -3282,7 +3282,7 @@ static void builtin_diff(const char *name_a,
|
||||
xecfg.ctxlen = o->context;
|
||||
xecfg.interhunkctxlen = o->interhunkcontext;
|
||||
xecfg.flags = XDL_EMIT_FUNCNAMES;
|
||||
if (o->flags.FUNCCONTEXT)
|
||||
if (o->flags.funccontext)
|
||||
xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
|
||||
if (pe)
|
||||
xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
|
||||
@ -3447,7 +3447,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
|
||||
diff_free_filespec_data(one);
|
||||
diff_free_filespec_data(two);
|
||||
if (data.status)
|
||||
o->flags.CHECK_FAILED = 1;
|
||||
o->flags.check_failed = 1;
|
||||
}
|
||||
|
||||
struct diff_filespec *alloc_filespec(const char *path)
|
||||
@ -3941,9 +3941,9 @@ static void fill_metainfo(struct strbuf *msg,
|
||||
*must_show_header = 0;
|
||||
}
|
||||
if (one && two && oidcmp(&one->oid, &two->oid)) {
|
||||
int abbrev = o->flags.FULL_INDEX ? 40 : DEFAULT_ABBREV;
|
||||
int abbrev = o->flags.full_index ? 40 : DEFAULT_ABBREV;
|
||||
|
||||
if (o->flags.BINARY) {
|
||||
if (o->flags.binary) {
|
||||
mmfile_t mf;
|
||||
if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
|
||||
(!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
|
||||
@ -3973,7 +3973,7 @@ static void run_diff_cmd(const char *pgm,
|
||||
int must_show_header = 0;
|
||||
|
||||
|
||||
if (o->flags.ALLOW_EXTERNAL) {
|
||||
if (o->flags.allow_external) {
|
||||
struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
|
||||
if (drv && drv->external)
|
||||
pgm = drv->external;
|
||||
@ -4053,7 +4053,7 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o)
|
||||
if (o->prefix_length)
|
||||
strip_prefix(o->prefix_length, &name, &other);
|
||||
|
||||
if (!o->flags.ALLOW_EXTERNAL)
|
||||
if (!o->flags.allow_external)
|
||||
pgm = NULL;
|
||||
|
||||
if (DIFF_PAIR_UNMERGED(p)) {
|
||||
@ -4152,7 +4152,7 @@ void diff_setup(struct diff_options *options)
|
||||
options->context = diff_context_default;
|
||||
options->interhunkcontext = diff_interhunk_context_default;
|
||||
options->ws_error_highlight = ws_error_highlight_default;
|
||||
options->flags.RENAME_EMPTY = 1;
|
||||
options->flags.rename_empty = 1;
|
||||
|
||||
/* pathchange left =NULL by default */
|
||||
options->change = diff_change;
|
||||
@ -4203,14 +4203,14 @@ void diff_setup_done(struct diff_options *options)
|
||||
if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
|
||||
DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
|
||||
DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
|
||||
options->flags.DIFF_FROM_CONTENTS = 1;
|
||||
options->flags.diff_from_contents = 1;
|
||||
else
|
||||
options->flags.DIFF_FROM_CONTENTS = 0;
|
||||
options->flags.diff_from_contents = 0;
|
||||
|
||||
if (options->flags.FIND_COPIES_HARDER)
|
||||
if (options->flags.find_copies_harder)
|
||||
options->detect_rename = DIFF_DETECT_COPY;
|
||||
|
||||
if (!options->flags.RELATIVE_NAME)
|
||||
if (!options->flags.relative_name)
|
||||
options->prefix = NULL;
|
||||
if (options->prefix)
|
||||
options->prefix_length = strlen(options->prefix);
|
||||
@ -4240,18 +4240,18 @@ void diff_setup_done(struct diff_options *options)
|
||||
DIFF_FORMAT_DIRSTAT |
|
||||
DIFF_FORMAT_SUMMARY |
|
||||
DIFF_FORMAT_CHECKDIFF))
|
||||
options->flags.RECURSIVE = 1;
|
||||
options->flags.recursive = 1;
|
||||
/*
|
||||
* Also pickaxe would not work very well if you do not say recursive
|
||||
*/
|
||||
if (options->pickaxe)
|
||||
options->flags.RECURSIVE = 1;
|
||||
options->flags.recursive = 1;
|
||||
/*
|
||||
* When patches are generated, submodules diffed against the work tree
|
||||
* must be checked for dirtiness too so it can be shown in the output
|
||||
*/
|
||||
if (options->output_format & DIFF_FORMAT_PATCH)
|
||||
options->flags.DIRTY_SUBMODULES = 1;
|
||||
options->flags.dirty_submodules = 1;
|
||||
|
||||
if (options->detect_rename && options->rename_limit < 0)
|
||||
options->rename_limit = diff_rename_limit_default;
|
||||
@ -4273,14 +4273,14 @@ void 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 (options->flags.QUICK) {
|
||||
if (options->flags.quick) {
|
||||
options->output_format = DIFF_FORMAT_NO_OUTPUT;
|
||||
options->flags.EXIT_WITH_STATUS = 1;
|
||||
options->flags.exit_with_status = 1;
|
||||
}
|
||||
|
||||
options->diff_path_counter = 0;
|
||||
|
||||
if (options->flags.FOLLOW_RENAMES && options->pathspec.nr != 1)
|
||||
if (options->flags.follow_renames && options->pathspec.nr != 1)
|
||||
die(_("--follow requires exactly one pathspec"));
|
||||
|
||||
if (!options->use_color || external_diff())
|
||||
@ -4630,7 +4630,7 @@ int diff_opt_parse(struct diff_options *options,
|
||||
else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
|
||||
!strcmp(arg, "--find-copies")) {
|
||||
if (options->detect_rename == DIFF_DETECT_COPY)
|
||||
options->flags.FIND_COPIES_HARDER = 1;
|
||||
options->flags.find_copies_harder = 1;
|
||||
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
|
||||
return error("invalid argument to -C: %s", arg+2);
|
||||
options->detect_rename = DIFF_DETECT_COPY;
|
||||
@ -4638,13 +4638,13 @@ int diff_opt_parse(struct diff_options *options,
|
||||
else if (!strcmp(arg, "--no-renames"))
|
||||
options->detect_rename = 0;
|
||||
else if (!strcmp(arg, "--rename-empty"))
|
||||
options->flags.RENAME_EMPTY = 1;
|
||||
options->flags.rename_empty = 1;
|
||||
else if (!strcmp(arg, "--no-rename-empty"))
|
||||
options->flags.RENAME_EMPTY = 0;
|
||||
options->flags.rename_empty = 0;
|
||||
else if (!strcmp(arg, "--relative"))
|
||||
options->flags.RELATIVE_NAME = 1;
|
||||
options->flags.relative_name = 1;
|
||||
else if (skip_prefix(arg, "--relative=", &arg)) {
|
||||
options->flags.RELATIVE_NAME = 1;
|
||||
options->flags.relative_name = 1;
|
||||
options->prefix = arg;
|
||||
}
|
||||
|
||||
@ -4684,21 +4684,21 @@ int diff_opt_parse(struct diff_options *options,
|
||||
/* flags options */
|
||||
else if (!strcmp(arg, "--binary")) {
|
||||
enable_patch_output(&options->output_format);
|
||||
options->flags.BINARY = 1;
|
||||
options->flags.binary = 1;
|
||||
}
|
||||
else if (!strcmp(arg, "--full-index"))
|
||||
options->flags.FULL_INDEX = 1;
|
||||
options->flags.full_index = 1;
|
||||
else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
|
||||
options->flags.TEXT = 1;
|
||||
options->flags.text = 1;
|
||||
else if (!strcmp(arg, "-R"))
|
||||
options->flags.REVERSE_DIFF = 1;
|
||||
options->flags.reverse_diff = 1;
|
||||
else if (!strcmp(arg, "--find-copies-harder"))
|
||||
options->flags.FIND_COPIES_HARDER = 1;
|
||||
options->flags.find_copies_harder = 1;
|
||||
else if (!strcmp(arg, "--follow"))
|
||||
options->flags.FOLLOW_RENAMES = 1;
|
||||
options->flags.follow_renames = 1;
|
||||
else if (!strcmp(arg, "--no-follow")) {
|
||||
options->flags.FOLLOW_RENAMES = 0;
|
||||
options->flags.DEFAULT_FOLLOW_RENAMES = 0;
|
||||
options->flags.follow_renames = 0;
|
||||
options->flags.default_follow_renames = 0;
|
||||
} else if (!strcmp(arg, "--color"))
|
||||
options->use_color = 1;
|
||||
else if (skip_prefix(arg, "--color=", &arg)) {
|
||||
@ -4755,23 +4755,23 @@ int diff_opt_parse(struct diff_options *options,
|
||||
return argcount;
|
||||
}
|
||||
else if (!strcmp(arg, "--exit-code"))
|
||||
options->flags.EXIT_WITH_STATUS = 1;
|
||||
options->flags.exit_with_status = 1;
|
||||
else if (!strcmp(arg, "--quiet"))
|
||||
options->flags.QUICK = 1;
|
||||
options->flags.quick = 1;
|
||||
else if (!strcmp(arg, "--ext-diff"))
|
||||
options->flags.ALLOW_EXTERNAL = 1;
|
||||
options->flags.allow_external = 1;
|
||||
else if (!strcmp(arg, "--no-ext-diff"))
|
||||
options->flags.ALLOW_EXTERNAL = 0;
|
||||
options->flags.allow_external = 0;
|
||||
else if (!strcmp(arg, "--textconv")) {
|
||||
options->flags.ALLOW_TEXTCONV = 1;
|
||||
options->flags.TEXTCONV_SET_VIA_CMDLINE = 1;
|
||||
options->flags.allow_textconv = 1;
|
||||
options->flags.textconv_set_via_cmdline = 1;
|
||||
} else if (!strcmp(arg, "--no-textconv"))
|
||||
options->flags.ALLOW_TEXTCONV = 0;
|
||||
options->flags.allow_textconv = 0;
|
||||
else if (!strcmp(arg, "--ignore-submodules")) {
|
||||
options->flags.OVERRIDE_SUBMODULE_CONFIG = 1;
|
||||
options->flags.override_submodule_config = 1;
|
||||
handle_ignore_submodules_arg(options, "all");
|
||||
} else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
|
||||
options->flags.OVERRIDE_SUBMODULE_CONFIG = 1;
|
||||
options->flags.override_submodule_config = 1;
|
||||
handle_ignore_submodules_arg(options, arg);
|
||||
} else if (!strcmp(arg, "--submodule"))
|
||||
options->submodule_format = DIFF_SUBMODULE_LOG;
|
||||
@ -4846,11 +4846,11 @@ int diff_opt_parse(struct diff_options *options,
|
||||
&options->interhunkcontext))
|
||||
;
|
||||
else if (!strcmp(arg, "-W"))
|
||||
options->flags.FUNCCONTEXT = 1;
|
||||
options->flags.funccontext = 1;
|
||||
else if (!strcmp(arg, "--function-context"))
|
||||
options->flags.FUNCCONTEXT = 1;
|
||||
options->flags.funccontext = 1;
|
||||
else if (!strcmp(arg, "--no-function-context"))
|
||||
options->flags.FUNCCONTEXT = 0;
|
||||
options->flags.funccontext = 0;
|
||||
else if ((argcount = parse_long_opt("output", av, &optarg))) {
|
||||
char *path = prefix_filename(prefix, optarg);
|
||||
options->file = xfopen(path, "w");
|
||||
@ -5600,7 +5600,7 @@ void diff_flush(struct diff_options *options)
|
||||
separator++;
|
||||
}
|
||||
|
||||
if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.DIRSTAT_BY_LINE)
|
||||
if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
|
||||
dirstat_by_line = 1;
|
||||
|
||||
if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
|
||||
@ -5635,8 +5635,8 @@ void diff_flush(struct diff_options *options)
|
||||
}
|
||||
|
||||
if (output_format & DIFF_FORMAT_NO_OUTPUT &&
|
||||
options->flags.EXIT_WITH_STATUS &&
|
||||
options->flags.DIFF_FROM_CONTENTS) {
|
||||
options->flags.exit_with_status &&
|
||||
options->flags.diff_from_contents) {
|
||||
/*
|
||||
* run diff_flush_patch for the exit status. setting
|
||||
* options->file to /dev/null should be safe, because we
|
||||
@ -5684,11 +5684,11 @@ free_queue:
|
||||
* diff_addremove/diff_change does not set the bit when
|
||||
* DIFF_FROM_CONTENTS is in effect (e.g. with -w).
|
||||
*/
|
||||
if (options->flags.DIFF_FROM_CONTENTS) {
|
||||
if (options->flags.diff_from_contents) {
|
||||
if (options->found_changes)
|
||||
options->flags.HAS_CHANGES = 1;
|
||||
options->flags.has_changes = 1;
|
||||
else
|
||||
options->flags.HAS_CHANGES = 0;
|
||||
options->flags.has_changes = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5808,7 +5808,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
|
||||
* to determine how many paths were dirty only
|
||||
* due to stat info mismatch.
|
||||
*/
|
||||
if (!diffopt->flags.NO_INDEX)
|
||||
if (!diffopt->flags.no_index)
|
||||
diffopt->skip_stat_unmatch++;
|
||||
diff_free_filepair(p);
|
||||
}
|
||||
@ -5857,10 +5857,10 @@ void diffcore_std(struct diff_options *options)
|
||||
diff_resolve_rename_copy();
|
||||
diffcore_apply_filter(options);
|
||||
|
||||
if (diff_queued_diff.nr && !options->flags.DIFF_FROM_CONTENTS)
|
||||
options->flags.HAS_CHANGES = 1;
|
||||
if (diff_queued_diff.nr && !options->flags.diff_from_contents)
|
||||
options->flags.has_changes = 1;
|
||||
else
|
||||
options->flags.HAS_CHANGES = 0;
|
||||
options->flags.has_changes = 0;
|
||||
|
||||
options->found_follow = 0;
|
||||
}
|
||||
@ -5872,23 +5872,23 @@ int diff_result_code(struct diff_options *opt, int status)
|
||||
diff_warn_rename_limit("diff.renameLimit",
|
||||
opt->needed_rename_limit,
|
||||
opt->degraded_cc_to_c);
|
||||
if (!opt->flags.EXIT_WITH_STATUS &&
|
||||
if (!opt->flags.exit_with_status &&
|
||||
!(opt->output_format & DIFF_FORMAT_CHECKDIFF))
|
||||
return status;
|
||||
if (opt->flags.EXIT_WITH_STATUS &&
|
||||
opt->flags.HAS_CHANGES)
|
||||
if (opt->flags.exit_with_status &&
|
||||
opt->flags.has_changes)
|
||||
result |= 01;
|
||||
if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
|
||||
opt->flags.CHECK_FAILED)
|
||||
opt->flags.check_failed)
|
||||
result |= 02;
|
||||
return result;
|
||||
}
|
||||
|
||||
int diff_can_quit_early(struct diff_options *opt)
|
||||
{
|
||||
return (opt->flags.QUICK &&
|
||||
return (opt->flags.quick &&
|
||||
!opt->filter &&
|
||||
opt->flags.HAS_CHANGES);
|
||||
opt->flags.has_changes);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -5901,9 +5901,9 @@ static int is_submodule_ignored(const char *path, struct diff_options *options)
|
||||
{
|
||||
int ignored = 0;
|
||||
struct diff_flags orig_flags = options->flags;
|
||||
if (!options->flags.OVERRIDE_SUBMODULE_CONFIG)
|
||||
if (!options->flags.override_submodule_config)
|
||||
set_diffopt_flags_from_submodule_config(options, path);
|
||||
if (options->flags.IGNORE_SUBMODULES)
|
||||
if (options->flags.ignore_submodules)
|
||||
ignored = 1;
|
||||
options->flags = orig_flags;
|
||||
return ignored;
|
||||
@ -5932,7 +5932,7 @@ void diff_addremove(struct diff_options *options,
|
||||
* Before the final output happens, they are pruned after
|
||||
* merged into rename/copy pairs as appropriate.
|
||||
*/
|
||||
if (options->flags.REVERSE_DIFF)
|
||||
if (options->flags.reverse_diff)
|
||||
addremove = (addremove == '+' ? '-' :
|
||||
addremove == '-' ? '+' : addremove);
|
||||
|
||||
@ -5951,8 +5951,8 @@ void diff_addremove(struct diff_options *options,
|
||||
}
|
||||
|
||||
diff_queue(&diff_queued_diff, one, two);
|
||||
if (!options->flags.DIFF_FROM_CONTENTS)
|
||||
options->flags.HAS_CHANGES = 1;
|
||||
if (!options->flags.diff_from_contents)
|
||||
options->flags.has_changes = 1;
|
||||
}
|
||||
|
||||
void diff_change(struct diff_options *options,
|
||||
@ -5970,7 +5970,7 @@ void diff_change(struct diff_options *options,
|
||||
is_submodule_ignored(concatpath, options))
|
||||
return;
|
||||
|
||||
if (options->flags.REVERSE_DIFF) {
|
||||
if (options->flags.reverse_diff) {
|
||||
SWAP(old_mode, new_mode);
|
||||
SWAP(old_oid, new_oid);
|
||||
SWAP(old_oid_valid, new_oid_valid);
|
||||
@ -5989,14 +5989,14 @@ void diff_change(struct diff_options *options,
|
||||
two->dirty_submodule = new_dirty_submodule;
|
||||
p = diff_queue(&diff_queued_diff, one, two);
|
||||
|
||||
if (options->flags.DIFF_FROM_CONTENTS)
|
||||
if (options->flags.diff_from_contents)
|
||||
return;
|
||||
|
||||
if (options->flags.QUICK && options->skip_stat_unmatch &&
|
||||
if (options->flags.quick && options->skip_stat_unmatch &&
|
||||
!diff_filespec_check_stat_unmatch(p))
|
||||
return;
|
||||
|
||||
options->flags.HAS_CHANGES = 1;
|
||||
options->flags.has_changes = 1;
|
||||
}
|
||||
|
||||
struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
|
||||
@ -6134,7 +6134,7 @@ void setup_diff_pager(struct diff_options *opt)
|
||||
* and because it is easy to find people oneline advising "git diff
|
||||
* --exit-code" in hooks and other scripts, we do not do so.
|
||||
*/
|
||||
if (!opt->flags.EXIT_WITH_STATUS &&
|
||||
if (!opt->flags.exit_with_status &&
|
||||
check_pager_config("diff") != 0)
|
||||
setup_pager();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user