diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:27 +0300 |
| commit | 6e21f716f89d190017fa675738e9e7cc1a74680a (patch) | |
| tree | c40a0caddb625b949806c323c66d404e98ff2588 /builtin | |
| parent | a5619d4f8d91a179d0e21aa16fda52fb4f0f7eaf (diff) | |
| parent | 8ef6aad664715c16caf6e36a7f6b174a06574477 (diff) | |
Merge branch 'jk/commit-edit-fixup-fix'
"git commit --fixup" now works with "--edit" again, after it was
broken in v2.32.
* jk/commit-edit-fixup-fix:
commit: restore --edit when combined with --fixup
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 243c626307..7c9b1e7be3 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -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); |