]> git.ipfire.org Git - thirdparty/git.git/commitdiff
revision: add separate field for "-m" of "diff-index -m"
authorSergey Organov <sorganov@gmail.com>
Mon, 31 Aug 2020 20:14:22 +0000 (23:14 +0300)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2020 20:42:58 +0000 (13:42 -0700)
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>

No differences found