2.24.1: git cherry-pick --edit fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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)



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux