From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 124271F463 for ; Sun, 29 Dec 2019 20:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727149AbfL2UeU (ORCPT ); Sun, 29 Dec 2019 15:34:20 -0500 Received: from sdaoden.eu ([217.144.132.164]:59786 "EHLO sdaoden.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbfL2UeU (ORCPT ); Sun, 29 Dec 2019 15:34:20 -0500 X-Greylist: delayed 303 seconds by postgrey-1.27 at vger.kernel.org; Sun, 29 Dec 2019 15:34:19 EST Received: by sdaoden.eu (Postfix, from userid 1000) id 4499016057; Sun, 29 Dec 2019 21:29:15 +0100 (CET) Date: Sun, 29 Dec 2019 21:29:13 +0100 From: Steffen Nurpmeso To: git@vger.kernel.org Cc: Steffen Nurpmeso Subject: 2.24.1: git cherry-pick --edit fails Message-ID: <20191229202913.LE_3R%steffen@sdaoden.eu> Mail-Followup-To: git@vger.kernel.org, Steffen Nurpmeso User-Agent: s-nail v14.9.15-262-g449d711c OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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)