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>
This commit is contained in:

committed by
Junio C Hamano

parent
5d213e46bb
commit
8ef6aad664
@ -1253,8 +1253,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
||||
|
||||
if (logfile || have_option_m || use_message)
|
||||
use_editor = 0;
|
||||
if (0 <= edit_flag)
|
||||
use_editor = edit_flag;
|
||||
|
||||
/* Sanity check options */
|
||||
if (amend && !current_head)
|
||||
@ -1344,6 +1342,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
||||
}
|
||||
}
|
||||
|
||||
if (0 <= edit_flag)
|
||||
use_editor = edit_flag;
|
||||
|
||||
cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor);
|
||||
|
||||
handle_untracked_files_arg(s);
|
||||
|
Reference in New Issue
Block a user