From patchwork Wed Oct 3 15:00:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 10625001 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 06AEC1515 for ; Wed, 3 Oct 2018 15:00:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED1B328DDF for ; Wed, 3 Oct 2018 15:00:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E130828DF5; Wed, 3 Oct 2018 15:00:25 +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 5CC0828DDF for ; Wed, 3 Oct 2018 15:00:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726856AbeJCVtJ (ORCPT ); Wed, 3 Oct 2018 17:49:09 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:37386 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726748AbeJCVtJ (ORCPT ); Wed, 3 Oct 2018 17:49:09 -0400 Received: by mail-pl1-f196.google.com with SMTP id az3-v6so3617645plb.4 for ; Wed, 03 Oct 2018 08:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=vQJCeMQH+T5I0zx8MJTVY7L957YxJ9IacuzDrLNiqSM=; b=Y5Oy6Mf3k0/1725jxH3GAmR6BvBjP34OA9FBe0y0UCfCEIjWdEQARptGblS+btGNIh JxvLI3ZkM7lHLvusRkuuuvyNEjdJlhzk4eDJfmXo7WLBDASyHa0lWkgNAWEp3++wzmuS JuU+LjuH5pFWtpPhClvsdcvnCwoPSzuWFITDdahvXlCf1TsH1w6UVHpArjSDjk75THpL e9n6kN8K5hhs4o5iFqiFpZdxY1SwHbYl7aOS2aGl2ZPfCimUCXi4lXNXfGNgAcRbR/KH DoilTTTaqCnLOKVcqJJL6MxenXl938K5rdt/tH3qXNQ18M4EQitk/elYJT+c4dcrB55M pn3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=vQJCeMQH+T5I0zx8MJTVY7L957YxJ9IacuzDrLNiqSM=; b=EdThhWVb0jl0KZzFZG7aj3V3qoIb4syTOnmNH4OLkni0AWY9IfCIDB7SUGXg5MscIk jqVu+DAQ3D1YCPILHBzxkbcN3YWPGMZhVIc3RR3hStwWcl/2+pdpje/zyI9Ps9K6xDKR f3CoiQSMDGNbwK/tY+UU64w9WNxYPAvoFHysyadQqe8FmNq+EiA+B2DLNuwCibPia684 Gg+Sp7nNL0MYGrab4G3SGknmoYIFlC3jMlr0GIUCpZwFbLjOAS20wVcO6y0+IRvRZGO0 a2EbSrhyeRGofDyfcpmGvJOliNqs9ltYF5Nv+WGfxPXCjla8iSDYkanI8jO7zAEi+Asu m9nA== X-Gm-Message-State: ABuFfoil1l+Mv5H1DpVAbMkRa9aqVnlH9tyMosMiFUlZtHQOO6ddpvgV EYs9Bjgz5hSMCQuhNwc7lRADep/f X-Google-Smtp-Source: ACcGV63dAwdOzcwsVhCAPMbgXiGn3CwUBNJTModeL0J258ZZ+3arEbWsEc76oQTIYDk5OBTUk0tuKw== X-Received: by 2002:a17:902:2e83:: with SMTP id r3-v6mr2101129plb.80.1538578822664; Wed, 03 Oct 2018 08:00:22 -0700 (PDT) Received: from [127.0.0.1] ([40.112.137.127]) by smtp.gmail.com with ESMTPSA id 22-v6sm3384547pfl.126.2018.10.03.08.00.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 08:00:21 -0700 (PDT) Date: Wed, 03 Oct 2018 08:00:21 -0700 (PDT) X-Google-Original-Date: Wed, 03 Oct 2018 15:00:18 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 1/1] rebase -i: introduce the 'break' command Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Stefan Beller , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The 'edit' command can be used to cherry-pick a commit and then immediately drop out of the interactive rebase, with exit code 0, to let the user amend the commit, or test it, or look around. Sometimes this functionality would come in handy *without* cherry-picking a commit, e.g. to interrupt the interactive rebase even before cherry-picking a commit, or immediately after an 'exec' or a 'merge'. This commit introduces that functionality, as the spanking new 'break' command. Suggested-by: Stefan Beller Signed-off-by: Johannes Schindelin Signed-off-by: Johannes Schindelin --- rebase-interactive.c | 1 + sequencer.c | 7 ++++++- t/lib-rebase.sh | 2 +- t/t3418-rebase-continue.sh | 9 +++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/rebase-interactive.c b/rebase-interactive.c index 0f4119cbae..78f3263fc1 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -14,6 +14,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty, "s, squash = use commit, but meld into previous commit\n" "f, fixup = like \"squash\", but discard this commit's log message\n" "x, exec = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" "l, label