tree 80115197a3bc1cd4b263166fe01e5a35652b88eb
parent 0c627f5d3cbcb7d85219d9a4cfc195f7d4230b3d
author Sergey Organov <sorganov@gmail.com> 1608563982 +0300
committer Junio C Hamano <gitster@pobox.com> 1608587251 -0800

diff-merges: revise revs->diff flag handling

Do not set revs->diff when we encounter an option that needs it, as
it'd be impossible to undo later. Besides, some other options than
what we handle here set this flag as well, and we'd interfere with
them trying to clear this flag later.

Rather set revs->diff, if finally needed, in diff_merges_setup_revs().

As an additional bonus, this also makes our code shorter.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>