]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d213e4) | patch
commit: restore --edit when combined with --fixup
authorJoel Klinghed <the_jk@spawned.biz>
Sat, 14 Aug 2021 21:40:30 +0000 (21:40 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Aug 2021 16:44:08 +0000 (09:44 -0700)
commit8ef6aad664715c16caf6e36a7f6b174a06574477
tree96e439d18259f1fcc2262478b9b5a7c3113b4231tree | snapshot
parent5d213e46bb7b880238ff5ea3914e940a50ae9369commit | diff
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>
builtin/commit.c diff | blob | blame | history
t/t7500-commit-template-squash-signoff.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.