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.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 539A11F619 for ; Wed, 11 Mar 2020 18:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730825AbgCKSiZ (ORCPT ); Wed, 11 Mar 2020 14:38:25 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:58926 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730734AbgCKSiZ (ORCPT ); Wed, 11 Mar 2020 14:38:25 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 2A1A0C5561; Wed, 11 Mar 2020 14:38:23 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=eCMSgJoAftjU/5GqwCQN+9B1dX0=; b=jHHMo/ bR5lJeDSLgINYzaauY90tPdsf6No77RXx8oNaMWtwbNyuaWokXD8gYsOms2XfivM ggu2N3Y62hCTs+h5plBSVOdNGmUJDcUYcjxjoz1Ot1fQgXOFlVJMf90fybu6tZ/c bZgoKuf3ECThmDV7rbKWwDWwoibj8vNm9j1z0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=Z1hBVRn1QzqFdLavJ3hnuZGWx0TKk38b ZLLdZU8a00K/4B5iVeQzWE3OHkkCna9efxA3IlSO6B4oTRWd1hCkHYjlVo6qHlGO XB7dYhMwn8IFRy7DhArf/lM/QoHXBzub2rcuraHCDSd1J0fDkTxk4zLRPKI1l2qn CE+Cok62kx8= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 22858C5560; Wed, 11 Mar 2020 14:38:23 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 68BDBC555F; Wed, 11 Mar 2020 14:38:20 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Elijah Newren via GitGitGadget Cc: Phillip Wood , git@vger.kernel.org, Jeff King , Elijah Newren Subject: Re: [PATCH 1/2] sequencer: clear CHERRY_PICK_HEAD upon dropping a become-empty commit References: <132f769adb0a34e74b6c237ff84bf8b624ea0d9f.1583903621.git.gitgitgadget@gmail.com> <94eec36b-581a-17eb-7aeb-2d24c90b8e73@gmail.com> Date: Wed, 11 Mar 2020 11:38:18 -0700 In-Reply-To: <94eec36b-581a-17eb-7aeb-2d24c90b8e73@gmail.com> (Phillip Wood's message of "Wed, 11 Mar 2020 10:30:43 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 7B2D8BF0-63C7-11EA-B92E-8D86F504CC47-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Phillip Wood writes: > Thanks for fixing this, it needs to clean up MERGE_MSG as well though > > Best Wishes > > Phillip > >> Signed-off-by: Elijah Newren >> --- >> sequencer.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/sequencer.c b/sequencer.c >> index 7477b15422a..8b4e0200c5f 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -1957,6 +1957,7 @@ static int do_pick_commit(struct repository *r, >> flags |= ALLOW_EMPTY; >> } else if (allow == 2) { >> drop_commit = 1; >> + unlink(git_path_cherry_pick_head(r)); When this fails for whatever reason, do we need to do something special? The same question for MERGE_MSG Phillip mentioned. Thanks, both. >> fprintf(stderr, >> _("dropping %s %s -- patch contents already upstream\n"), >> oid_to_hex(&commit->object.oid), msg.subject); >>