From: "Joel Klinghed via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Joel Klinghed <the_jk@spawned.biz>,
Joel Klinghed <the_jk@spawned.biz>
Subject: [PATCH v2] commit: restore --edit when combined with --fixup
Date: Wed, 11 Aug 2021 23:43:41 +0000 [thread overview]
Message-ID: <pull.1014.v2.git.1628725421868.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1014.git.1628689758413.gitgitgadget@gmail.com>
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>
---
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.
Signed-off-by: Joel Klinghed the_jk@spawned.biz
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1014%2Fthejk%2Ffixup_edit-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1014/thejk/fixup_edit-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1014
Range-diff vs v1:
1: b3e44c6ccde ! 1: 0ee926d4149 commit: restore --edit when combined with --fixup
@@ builtin/commit.c: static int parse_and_validate_options(int argc, const char *ar
}
}
+
+ ## t/t7500-commit-template-squash-signoff.sh ##
+@@ t/t7500-commit-template-squash-signoff.sh: test_expect_success 'commit --fixup -m"something" -m"extra"' '
+
+ extra"
+ '
++test_expect_success 'commit --fixup --edit' '
++ commit_for_rebase_autosquash_setup &&
++ cat >e-append <<-\EOF &&
++ #!/bin/sh
++ 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"
++'
++
+ get_commit_msg () {
+ rev="$1" &&
+ git log -1 --pretty=format:"%B" "$rev"
builtin/commit.c | 3 ++-
t/t7500-commit-template-squash-signoff.sh | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 190d215d43b..4c5286840c5 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 (0 > edit_flag)
+ use_editor = 0;
}
}
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 7d02f79c0de..d71c7812180 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -281,6 +281,21 @@ test_expect_success 'commit --fixup -m"something" -m"extra"' '
extra"
'
+test_expect_success 'commit --fixup --edit' '
+ commit_for_rebase_autosquash_setup &&
+ cat >e-append <<-\EOF &&
+ #!/bin/sh
+ 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"
+'
+
get_commit_msg () {
rev="$1" &&
git log -1 --pretty=format:"%B" "$rev"
base-commit: ebf3c04b262aa27fbb97f8a0156c2347fecafafb
--
gitgitgadget
next prev parent reply other threads:[~2021-08-11 23:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 13:49 [PATCH] commit: restore --edit when combined with --fixup Joel Klinghed via GitGitGadget
2021-08-11 20:24 ` Jeff King
2021-08-11 22:10 ` Joel Klinghed
2021-08-11 22:22 ` Jeff King
2021-08-11 23:27 ` brian m. carlson
2021-08-11 23:43 ` Joel Klinghed via GitGitGadget [this message]
2021-08-12 5:21 ` [PATCH v2] " Junio C Hamano
2021-08-12 7:42 ` Joel Klinghed
2021-08-12 19:51 ` Junio C Hamano
2021-08-12 8:02 ` [PATCH v3] " Joel Klinghed via GitGitGadget
2021-08-12 9:32 ` Phillip Wood
2021-08-12 10:01 ` Joel Klinghed
2021-08-13 13:06 ` Phillip Wood
2021-08-13 15:35 ` Joel Klinghed
2021-08-14 15:20 ` Phillip Wood
2021-08-14 21:19 ` Joel Klinghed
2021-08-12 11:55 ` [PATCH v4] " Joel Klinghed via GitGitGadget
2021-08-14 21:40 ` [PATCH v5] " Joel Klinghed via GitGitGadget
2021-08-17 10:06 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1014.v2.git.1628725421868.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=the_jk@spawned.biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).