From: "Joel Klinghed" <the_jk@spawned.biz>
To: phillip.wood@dunelm.org.uk,
"Joel Klinghed via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v3] commit: restore --edit when combined with --fixup
Date: Thu, 12 Aug 2021 12:01:10 +0200 [thread overview]
Message-ID: <0576a44a-c726-4550-ad29-52f09982de98@www.fastmail.com> (raw)
In-Reply-To: <e3a24819-9953-0245-7f64-472def4d180a@gmail.com>
On Thu, Aug 12, 2021, at 11:32, Phillip Wood wrote:
> Hi Joel
>
> @@ -1170,7 +1206,7 @@ static int parse_and_validate_options(int argc,
> const char *argv[],
> if (force_author && renew_authorship)
> die(_("Using both --reset-author and --author does not
> make sense"));
>
> - if (logfile || have_option_m || use_message || fixup_message)
> + if (logfile || have_option_m || use_message)
> use_editor = 0;
> if (0 <= edit_flag)
> use_editor = edit_flag;
>
> I think it should have moved those last two context lines that set
> `use_editor` to below the part that you are fixing. Then the `use_editor
> = 0` line that you are changing continues to work as before. (As you see
> there are quite a few legacy Yoda conditions in this file, nowadays we
> avoid adding new ones). I'm not sure if it is worth re working this
> patch to do that, but it does have the advantage of only testing
> edit_flag once.
I looked at moving the condition to one place but as use_editor = 0
is only set for --fixup if there isn't a suboption specified I didn't want
to have to duplicate the check for a suboption when deciding if
use_editor should default to zero.
> > 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
>
> Again I'm not sure it is worth changing it now but for future reference
> this is a rather complicated way of appending to the commit message. The
> test file has an example using set_fake_editor() together with
> FAKE_COMMIT_AMEND just below where you have added this test or you can
> just have
>
> EDITOR="echo something extra >>" git commit --fixup=HEAD~1 --edit
>
> Best Wishes
>
> Phillip
>
Yeah, especially getting sed in a POSIX and BSD compatible mode took some
doing. I wanted to have a similar output to the test above this one, with a line break
between something and extra, and frankly, my shell-foo lacked for
getting either FAKE_COMMIT_AMEND or EDITOR="... >>" to include a newline.
But looking at it again, I realize that EDITOR="printf \"something\nextra\" >>"
works just fine.
/JK
next prev parent reply other threads:[~2021-08-12 10:03 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 ` [PATCH v2] " Joel Klinghed via GitGitGadget
2021-08-12 5:21 ` 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 [this message]
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=0576a44a-c726-4550-ad29-52f09982de98@www.fastmail.com \
--to=the_jk@spawned.biz \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sandals@crustytoothpaste.net \
/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).