From: Joel Klinghed <the_jk@xxxxxxxxxxx>
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@xxxxxxxxxxx>
---
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 only changing the default if
edit_flag is not set.
Changes since v1: Added test verifying that --fixup --edit brings up
editor.
Changes since v2: Clarify if condition and use write_script helper in
test.
Signed-off-by: Joel Klinghed the_jk@xxxxxxxxxxx
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1014%2Fthejk%2Ffixup_edit-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1014/thejk/fixup_edit-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1014
Range-diff vs v2:
1: 0ee926d4149 ! 1: 6bc5d8bbe61 commit: restore --edit when combined with --fixup
@@ builtin/commit.c: static int parse_and_validate_options(int argc, const char *ar
fixup_commit = fixup_message;
fixup_prefix = "fixup";
- use_editor = 0;
-+ if (0 > edit_flag)
++ if (edit_flag < 0)
+ use_editor = 0;
}
}
@@ t/t7500-commit-template-squash-signoff.sh: test_expect_success 'commit --fixup -
'
+test_expect_success 'commit --fixup --edit' '
+ commit_for_rebase_autosquash_setup &&
-+ cat >e-append <<-\EOF &&
-+ #!/bin/sh
++ write_script e-append <<-\EOF &&
+ sed -e "2a\\
+something\\
+extra" <"$1" >"$1-"
+ mv "$1-" "$1"
+ EOF
-+ chmod 755 e-append &&
+ EDITOR="./e-append" git commit --fixup HEAD~1 --edit &&
+ commit_msg_is "fixup! target message subject linesomething
+extra"
builtin/commit.c | 3 ++-
t/t7500-commit-template-squash-signoff.sh | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 190d215d43b..560aecd21b1 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1333,7 +1333,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
} else {
fixup_commit = fixup_message;
fixup_prefix = "fixup";
- use_editor = 0;
+ if (edit_flag < 0)
+ use_editor = 0;
}
}
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 7d02f79c0de..a48fe859235 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -281,6 +281,19 @@ test_expect_success 'commit --fixup -m"something" -m"extra"' '
extra"
'
+test_expect_success 'commit --fixup --edit' '
+ commit_for_rebase_autosquash_setup &&
+ write_script e-append <<-\EOF &&
+ sed -e "2a\\
+something\\
+extra" <"$1" >"$1-"
+ mv "$1-" "$1"
+ EOF
+ EDITOR="./e-append" git commit --fixup HEAD~1 --edit &&
+ commit_msg_is "fixup! target message subject linesomething
+extra"
+'
+
get_commit_msg () {
rev="$1" &&
git log -1 --pretty=format:"%B" "$rev"
base-commit: ebf3c04b262aa27fbb97f8a0156c2347fecafafb
--
gitgitgadget
