git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: "Björn Lindqvist" <bjourne@gmail.com>, git@vger.kernel.org
Subject: Re: git rebase --continue error message is misleading
Date: Fri, 13 Dec 2024 14:38:00 +0000	[thread overview]
Message-ID: <534e8534-a9bd-428b-87f9-a512c9378b19@gmail.com> (raw)
In-Reply-To: <CALG+76eJL5dC3o+yq7zreoRDQan1MPgfNXB42k5f2iq2bZEbNw@mail.gmail.com>

Hi Björn

Thanks for reporting this

On 09/12/2024 13:02, Björn Lindqvist wrote:
> $ LANG=C git rebase --continue
> hint: Waiting for your editor to close the file... error: cannot run
> vi: No such file or directory
> error: unable to start editor 'vi'
> Please supply the message using either -m or -F option.

This line comes from "git commit" whenever launch_editor() fails. I 
wonder if we'd be better to recommend that the user sets up a working 
editor instead. The message is certainly unhelpful when we run "git 
commit" from "git cherry-pick/merge/rebase/revert" where we want to seed 
the message that the user edits.

> error: could not commit staged changes.
> $ git rebase --continue -m "done"
> ...
> $ git rebase --continue -F "done ffs"
> ...
> 
> It should say: Please commit the staged changes using git commit -m
> "commit message"

I don't think that is a good idea when "git commit" is being run from 
"git rebase". In that case we want to preserve the original message and 
authorship and using '-F' or '-m' would not do that.

Best Wishes

Phillip


  reply	other threads:[~2024-12-13 14:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-09 13:02 git rebase --continue error message is misleading Björn Lindqvist
2024-12-13 14:38 ` Phillip Wood [this message]
2025-02-10 10:19   ` Björn Lindqvist
2025-02-10 16:59     ` Junio C Hamano

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=534e8534-a9bd-428b-87f9-a512c9378b19@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=bjourne@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    /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).