Joel Klinghed 8ef6aad664 commit: restore --edit when combined with --fixup ...

Recent changes to --fixup, adding amend suboption, caused the
--edit flag to be ignored as use_editor was always set to zero.

Restore edit_flag having higher priority than fixup_message when
deciding the value of use_editor by moving the edit flag condition
later in the method.

Signed-off-by: Joel Klinghed <the_jk@spawned.biz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2021-08-15 09:44:08 -07:00

56 KiB

Raw Blame History

View Raw