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>
This commit is contained in:

committed by
Junio C Hamano

parent
d9cd433147
commit
572fc9aa54
@ -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;
|
||||
|
Reference in New Issue
Block a user