diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-08-31 23:14:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 23:42:58 +0300 |
| commit | 572fc9aa5471ce7a9888f03a32d556350f88a5cf (patch) | |
| tree | bb1e8ee0a3b79151a97235355210d664e7d27321 /revision.c | |
| parent | d9cd4331470f4d9d78677f12dc79063dab832f53 (diff) | |
revision: add separate field for "-m" of "diff-index -m"
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 96630e3186..73e3d14cc1 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; |