git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Nurpmeso <steffen@sdaoden.eu>
To: git@vger.kernel.org
Cc: Steffen Nurpmeso <steffen@sdaoden.eu>
Subject: 2.24.1: git cherry-pick --edit fails
Date: Sun, 29 Dec 2019 21:29:13 +0100	[thread overview]
Message-ID: <20191229202913.LE_3R%steffen@sdaoden.eu> (raw)

Hello again.

  P.S.: i can confirm the surroundings are fixed in 2.25.0-rc0!

Looking into the archives it could be addressed for upcoming
release already, please ignore then.  But with 2.24.1, if i do

  git cherry-pick --allow-empty --edit SHA1 SHA1...

i end up with

  [topic/anonymous-1 746c421c] include/mx: new-style headers: add forgotten struct forwards
   Date: Fri Aug 23 16:49:53 2019 +0200
   15 files changed, 43 insertions(+), 2 deletions(-)
  On branch topic/anonymous-1
  Cherry-pick currently in progress.

  nothing to commit, working tree clean
  The previous cherry-pick is now empty, possibly due to conflict resolution.
  If you wish to commit it anyway, use:

      git commit --allow-empty

  and then use:

      git cherry-pick --continue

  to resume cherry-picking the remaining commits.
  If you wish to skip this commit, use:

      git cherry-pick --skip

I.e., i edit the commit message, the commit message has been
modified and the valid is ok, but the above appears.


--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)

                 reply	other threads:[~2019-12-29 20:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20191229202913.LE_3R%steffen@sdaoden.eu \
    --to=steffen@sdaoden.eu \
    --cc=git@vger.kernel.org \
    /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).