]> git.ipfire.org Git - thirdparty/git.git/commit - diff-merges.c
diff-merges: move checks for first_parent_only out of the module
authorSergey Organov <sorganov@gmail.com>
Mon, 21 Dec 2020 15:19:35 +0000 (18:19 +0300)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2020 21:47:30 +0000 (13:47 -0800)
commit7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a
tree62a61608f95832357632e4b6d9bc17776ab4b684
parent18f09473bf8685a1f8db254cff915d4c31e86406
diff-merges: move checks for first_parent_only out of the module

The checks for first_parent_only don't in fact belong to this module,
as the primary purpose of this flag is history traversal limiting, so
get it out of this module and rename the

diff_merges_first_parent_defaults_to_enable()

to

diff_merges_default_to_enable()

to match new semantics.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/log.c
diff-merges.c
diff-merges.h