{"thread":{"id":"52535","subject":"2.24.1: git cherry-pick --edit fails","startedAt":"2019-12-29T20:34:22Z","lastAt":"2019-12-29T20:34:22Z","messageCount":1,"participants":["Steffen Nurpmeso"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"389044","messageId":"20191229202913.LE_3R%steffen@sdaoden.eu","threadId":"52535","inReplyTo":null,"subject":"2.24.1: git cherry-pick --edit fails","fromName":"Steffen Nurpmeso","fromEmail":"steffen@sdaoden.eu","sentAt":"2019-12-29T20:29:13Z","receivedAt":"2019-12-29T20:34:22Z","isPatch":false,"sender":{"key":"steffen@sdaoden.eu","avatar":"https://gravatar.com/avatar/d49e696effa4b8f04abdee3c3567a1638260b8fa05df4f389a373db04fc8a1b3?d=mp&s=160"},"body":"Hello again.\n\n  P.S.: i can confirm the surroundings are fixed in 2.25.0-rc0!\n\nLooking into the archives it could be addressed for upcoming\nrelease already, please ignore then.  But with 2.24.1, if i do\n\n  git cherry-pick --allow-empty --edit SHA1 SHA1...\n\ni end up with\n\n  [topic/anonymous-1 746c421c] include/mx: new-style headers: add forgotten struct forwards\n   Date: Fri Aug 23 16:49:53 2019 +0200\n   15 files changed, 43 insertions(+), 2 deletions(-)\n  On branch topic/anonymous-1\n  Cherry-pick currently in progress.\n\n  nothing to commit, working tree clean\n  The previous cherry-pick is now empty, possibly due to conflict resolution.\n  If you wish to commit it anyway, use:\n\n      git commit --allow-empty\n\n  and then use:\n\n      git cherry-pick --continue\n\n  to resume cherry-picking the remaining commits.\n  If you wish to skip this commit, use:\n\n      git cherry-pick --skip\n\nI.e., i edit the commit message, the commit message has been\nmodified and the valid is ok, but the above appears.\n\n\n--steffen\n|\n|Der Kragenbaer,                The moon bear,\n|der holt sich munter           he cheerfully and one by one\n|einen nach dem anderen runter  wa.ks himself off\n|(By Robert Gernhardt)\n"}]}