From: Joel Klinghed <the_jk@spawned.biz>

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 only changing the default
if edit_flag is not set.

Signed-off-by: Joel Klinghed <the_jk@spawned.biz>

Submitted-As: https://lore.kernel.org/git/pull.1014.v2.git.1628725421868.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1014.git.1628689758413.gitgitgadget@gmail.com