| Message ID | 20200831201422.27189-1-sorganov@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 572fc9aa5471ce7a9888f03a32d556350f88a5cf |
| Headers | show |
| Series | [v4] revision: add separate field for "-m" of "diff-index -m" | expand |
Sergey Organov <sorganov@gmail.com> writes: > Add separate 'match_missing' field for diff-index to use and set it when we > encounter "-m" option. This field won't then be cleared when another meaning of > "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by > future option(s) that might drive 'ignore_merges' field. > > Use this new field from diff-lib:do_oneway_diff() instead of reusing > 'ignore_merges' field. > > Signed-off-by: Sergey Organov <sorganov@gmail.com> > --- Looks good. Will queue. Thanks.
Junio C Hamano <gitster@pobox.com> writes: > Sergey Organov <sorganov@gmail.com> writes: > >> Add separate 'match_missing' field for diff-index to use and set it when we >> encounter "-m" option. This field won't then be cleared when another >> meaning of >> "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by >> future option(s) that might drive 'ignore_merges' field. >> >> Use this new field from diff-lib:do_oneway_diff() instead of reusing >> 'ignore_merges' field. >> >> Signed-off-by: Sergey Organov <sorganov@gmail.com> >> --- > > Looks good. Will queue. Thanks. Nice! Thanks a lot!
diff --git a/diff-lib.c b/diff-lib.c index 50521e2093fc..5d5d3dafab33 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -405,14 +405,8 @@ static void do_oneway_diff(struct unpack_trees_options *o, /* if the entry is not checked out, don't examine work tree */ cached = o->index_only || (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); - /* - * Backward compatibility wart - "diff-index -m" does - * not mean "do not ignore merges", but "match_missing". - * - * But with the revision flag parsing, that's found in - * "!revs->ignore_merges". - */ - match_missing = !revs->ignore_merges; + + match_missing = revs->match_missing; if (cached && idx && ce_stage(idx)) { struct diff_filepair *pair; diff --git a/revision.c b/revision.c index 96630e31867d..73e3d14cc165 100644 --- a/revision.c +++ b/revision.c @@ -2344,7 +2344,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->diffopt.flags.recursive = 1; revs->diffopt.flags.tree_in_recursive = 1; } else if (!strcmp(arg, "-m")) { + /* + * To "diff-index", "-m" means "match missing", and to the "log" + * family of commands, it means "show full diff for merges". Set + * both fields appropriately. + */ revs->ignore_merges = 0; + revs->match_missing = 1; } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) { if (!strcmp(optarg, "off")) { revs->ignore_merges = 1; diff --git a/revision.h b/revision.h index c1e5bcf139d7..f6bf860d19e5 100644 --- a/revision.h +++ b/revision.h @@ -188,6 +188,7 @@ struct rev_info { unsigned int diff:1, full_diff:1, show_root_diff:1, + match_missing:1, no_commit_id:1, verbose_header:1, combine_merges:1,
Add separate 'match_missing' field for diff-index to use and set it when we encounter "-m" option. This field won't then be cleared when another meaning of "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by future option(s) that might drive 'ignore_merges' field. Use this new field from diff-lib:do_oneway_diff() instead of reusing 'ignore_merges' field. Signed-off-by: Sergey Organov <sorganov@gmail.com> --- v4: fix new field name to be 'match_missing', and improve comment in the code to treat both involved bits similarily v3: improve commit message v2: rebased from 'maint' onto 'master' diff-lib.c | 10 ++-------- revision.c | 6 ++++++ revision.h | 1 + 3 files changed, 9 insertions(+), 8 deletions(-)