git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robert Coup <robert.coup@koordinates.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>
Subject: Re: bug/defaults: COMMIT_EDITMSG not reused after a failed commit
Date: Thu, 25 Jul 2024 09:15:14 +0100	[thread overview]
Message-ID: <CAFLLRpKqU7nBGsPsf=kdA9Z4F6QaZ91hsRvArRy0GaCfxUgsTg@mail.gmail.com> (raw)
In-Reply-To: <xmqq1q3iyceq.fsf@gitster.g>

Hi Junio,

On Wed, 24 Jul 2024 at 17:37, Junio C Hamano <gitster@pobox.com> wrote:
>
> Unconditionally doing this change would be disruptive to workflows
> of existing users.  To them, Git left COMMIT_EDITMSG available even
> after the commit to them almost forever, but suddenly it stops doing
> so.

A general question: how far down the "I can imagine a hypothetical
workflow" route do we need to go? Moreso when the behaviour is
documented as doing something different, and it's noted in the list
archive as a bug? I appreciate there's a lot of users out there who do
a lot of weird and wonderful things. Could it suffice for the
hypothetical user to have an opt-in way to get to the old behaviour?

Some experimenting reveals a simple `git commit -F
.git/COMMIT_EDITMSG` doesn't work, since the comments get committed;
and using `git commit --template .git/COMMIT_EDITMSG` repeats the
#boilerplate, and results in an "Aborting commit; you did not edit the
message." error, even when you do. `git commit --edit -F
.git/COMMIT_EDITMSG --cleanup=strip` works, except it also repeats the
#boilerplate again, and it's getting unwieldy. I'll explore Jeff's
patch too.

Thanks,

Rob :)

      parent reply	other threads:[~2024-07-25  8:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-24 11:28 bug/defaults: COMMIT_EDITMSG not reused after a failed commit Robert Coup
2024-07-24 16:37 ` Junio C Hamano
2024-07-24 16:53   ` Konstantin Ryabitsev
2024-07-24 21:08     ` Jeff King
2024-07-25 15:21       ` Junio C Hamano
2024-07-25  8:15   ` Robert Coup [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFLLRpKqU7nBGsPsf=kdA9Z4F6QaZ91hsRvArRy0GaCfxUgsTg@mail.gmail.com' \
    --to=robert.coup@koordinates.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.
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 NNTP newsgroup(s).