From patchwork Fri Mar 29 16:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 10877575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 491FF1390 for ; Fri, 29 Mar 2019 16:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30E09291AD for ; Fri, 29 Mar 2019 16:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20869291B4; Fri, 29 Mar 2019 16:32:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B71F291AD for ; Fri, 29 Mar 2019 16:32:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729454AbfC2Qc0 (ORCPT ); Fri, 29 Mar 2019 12:32:26 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53582 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729046AbfC2QcZ (ORCPT ); Fri, 29 Mar 2019 12:32:25 -0400 Received: by mail-wm1-f68.google.com with SMTP id q16so3140520wmj.3 for ; Fri, 29 Mar 2019 09:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=Rib1lk1ItT6/jMDfv0WiN9y6m9olZbkx7Afjpi6NuwE=; b=fqhhYE17OuhA9Y2nSb5nvnAuNv8ne8F2mNP2QEDopKafjaSUC7MtQ6L1rsCTHsZtU6 GpuqSU8y+Lmuy+elEM/v5wiizuDO6PPkPFolslIAzZUCNza4+kV7et96D7LqK3JY/2zd wyp4ubCrErw7F+i9vqbCHP29rTR0lG+jzuSi5wwbwtAxIIabpWgIv/V4966SITs8Bn61 ctrjOdtVFE+wvLLnwOiYg1aX0lrp8UutgzTO1NF3hPXMLg1X5jy9fi3PlP1Nac+GrujG 59EOJn7Gz3f7n3Uj7MEpdUq8bTfJDCFbXBqQs5sSpDm8QqwBAOOj8Di3X8i3xvlHX6Cn U66Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=Rib1lk1ItT6/jMDfv0WiN9y6m9olZbkx7Afjpi6NuwE=; b=MHduy3BZFb1TCeRWevoCmSEdMT2YclOrcYLl43j4LVYBkC193V/IMvvJoYowhPBUC0 EFejHY27Oavj6kWK2wISXF4gKJvqEqSgL0/NjU05TLzZ2A5At641JaIIcvgL9XM1arII +ljW/uVUYyN8T0jh8RtBRMv2jHGs33dTAxAi+/DPwzEpSAHIQbU9O9dFuto2h+MUjJX7 qgMC1vswTpO3jJkzeIlRfyjG2KSuPupsXyu6AOHugamLZVSxJSg46zTr/1hacPZyfNbl iAvfhObEc3KX8bJPZivYFgCDX5nUDnLeiNuwggHcUW2SjcWR8dYeN6rLuHsxYPrld2gB 1Cig== X-Gm-Message-State: APjAAAVaAE8c9oLUeSNDmNOquuacN4syMXYksue9yuSOgwjhTWEHAPjc HxWaulef5fmp+wnfrPaERq6hD4+2iJE= X-Google-Smtp-Source: APXvYqzkZ6PW5eQ7feeOHbslcM8VqImaUserdDc574sObGpyxpOg84tVMITQfg7bFzZArIgB8s4epw== X-Received: by 2002:a1c:c244:: with SMTP id s65mr1827427wmf.0.1553877143651; Fri, 29 Mar 2019 09:32:23 -0700 (PDT) Received: from localhost.localdomain (host-89-242-191-183.as13285.net. [89.242.191.183]) by smtp.gmail.com with ESMTPSA id j64sm3463175wmb.36.2019.03.29.09.32.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 09:32:22 -0700 (PDT) From: Phillip Wood To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano , Elijah Newren , Duy Nguyen , Phillip Wood Subject: [PATCH 0/2] A couple of cherry-pick related fixes Date: Fri, 29 Mar 2019 16:30:07 +0000 Message-Id: <20190329163009.493-1-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.21.0 Reply-To: Phillip Wood MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phillip Wood See the actual patches for a description of the fixes, I'm not sure about the second one, see the notes on it. I'm going to be mostly off-line for the next couple of weeks so it might take me a while to respond to any comments. Phillip Wood (2): commit/reset: try to clean up sequencer state fix cherry-pick/revert status after commit branch.c | 7 ++-- builtin/commit.c | 7 ++-- sequencer.c | 60 +++++++++++++++++++++++++++++++++ sequencer.h | 3 ++ t/t3507-cherry-pick-conflict.sh | 19 +++++++++++ t/t7512-status-help.sh | 19 +++++++++++ wt-status.c | 12 ++++++- 7 files changed, 122 insertions(+), 5 deletions(-)