From patchwork Fri Apr 5 21:40:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10887869 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 01E1F17E1 for ; Fri, 5 Apr 2019 21:40:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB40D284B3 for ; Fri, 5 Apr 2019 21:40:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9A3528A3B; Fri, 5 Apr 2019 21:40:11 +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 CC735284B3 for ; Fri, 5 Apr 2019 21:40:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726532AbfDEVkJ (ORCPT ); Fri, 5 Apr 2019 17:40:09 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:36418 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbfDEVkI (ORCPT ); Fri, 5 Apr 2019 17:40:08 -0400 Received: by mail-pl1-f194.google.com with SMTP id ck15so3702700plb.3 for ; Fri, 05 Apr 2019 14:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=0Q1wjQCTa3dLiZjRY3lYwHKqSutPDMZmGsWE8nTAVpI=; b=LLTo+zzO1ClOSRTzoeQ0zgZMHyFgexlLjyjbg6Iw+yLW3uMhWORN88MHoTez5/suYW V47Fd7YxklC4DrrNSKRO4ip8OHaMc68Gn+bUSFbuGpOfNfGqkwvFx69ZQ9A3Y6U68jqS FJO7otmKlVdm+ZOXjpoacgD8SGwz1u0JmMMyCm0EYOg1iSvRO/nUBgjzlI60OkJL90ne 551csaPVKc84Mz9dn4gKhu87TtpObfmfGAGo5S8ZPt09GDmErgvvyk6KKkcFa6LNVqb+ cF5L4Hd3POphcYi3HKfP4POd42+h9tBv91yVfpe3jqUGxzj/+j1h52uWslaiYMWXo4b7 cUWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=0Q1wjQCTa3dLiZjRY3lYwHKqSutPDMZmGsWE8nTAVpI=; b=RMJers8CegLwWJjHmCVzh7OushmVeXv0dmL8GsBD3LbizR7KP46yQiVOweePqyNbNr Y9SaEDT0i4/X74q0C8r/0kW6in/wYX+x2F+ccJdA+NvRxkcZGBuVq4rfyskc5rb1DQma 7jJ0zbv9tFm38wtLLn/7Cdo71p449Yro4rwn7F9s6yW5AqlPgZVL813f/50LZduYDQsh Fps747leaFDD+/9acvt89WlMoIGhv2ORyAb+ct3xCwngHOabdKhIh31jPmvgOfxmcYn6 6gC1GRW3sEhOmCvXWIAUPrU6Au6PyxIsyXUQVhFppWY4QnBKs8hy5nXQrpNRQ9V2hcdl VCuQ== X-Gm-Message-State: APjAAAWrUDsiS3rAaV9XcKDFPM7+IxFDdpFy+smoL/EqtXjQcvYkqWmJ Q1TQGCIGsJILpK3wupnZ21YLRZTl X-Google-Smtp-Source: APXvYqy9Tek/rfdN8FSKl1Xy59X0HMa7b5wb/SsrD7fbH9ICe98jTkwoQ4wgbum47YDEGr9sINZe0w== X-Received: by 2002:a17:902:2963:: with SMTP id g90mr15351191plb.182.1554500407838; Fri, 05 Apr 2019 14:40:07 -0700 (PDT) Received: from dev-l ([149.28.200.39]) by smtp.gmail.com with ESMTPSA id f71sm15300737pfc.109.2019.04.05.14.40.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Apr 2019 14:40:07 -0700 (PDT) Date: Fri, 5 Apr 2019 14:40:06 -0700 From: Denton Liu To: Git Mailing List Cc: Eric Sunshine , Junio C Hamano , =?iso-8859-1?q?=C6var_Arnfj=F6r=F0?= Bjarmason , Johannes Schindelin , Johannes Sixt , SZEDER =?iso-8859-1?q?G=E1bor?= Subject: [PATCH v4 4/4] rebase: teach rebase --keep-base Message-ID: <6635a99edebee43273ee47bbebe13dfe539fc69c.1554500051.git.liu.denton@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquash, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This is useful when contributing a patch series to the Git mailing list, one often starts on top of the current 'master'. However, while developing the patches, 'master' is also developed further and it is sometimes not the bst idea to keep rebasing on top of 'master', but to keep the base commit as-is. Alternatively, a user wishing to test individual commits in a topic branch without changing anything may run git rebase -x ./test.sh master... master Since rebasing onto the merge base of the branch and the upstream is such a common case, introduce the --keep-base option as a shortcut. This allows us to rewrite the above as git rebase -i --keep-base master and git rebase -x ./test.sh --keep-base master respectively. Add tests to ensure --keep-base works correctly in the normal case and fails when there are multiple merge bases, both in regular and interactive mode. Also, test to make sure conflicting options cause rebase to fail. While we're adding test cases, add a missing set_fake_editor call to 'rebase -i --onto master...side'. While we're documenting the --keep-base option, change an instance of "merge-base" to "merge base", which is the consistent spelling. Helped-by: Eric Sunshine Helped-by: Junio C Hamano Helped-by: Ævar Arnfjörð Bjarmason Helped-by: Johannes Schindelin Signed-off-by: Denton Liu --- Documentation/git-rebase.txt | 30 +++++++++++++++-- builtin/rebase.c | 32 ++++++++++++++---- t/t3416-rebase-onto-threedots.sh | 57 ++++++++++++++++++++++++++++++++ t/t3431-rebase-fork-point.sh | 4 +++ t/t3432-rebase-fast-forward.sh | 3 ++ 5 files changed, 117 insertions(+), 9 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6363d674b7..569ab708d4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -8,8 +8,8 @@ git-rebase - Reapply commits on top of another base tip SYNOPSIS -------- [verse] -'git rebase' [-i | --interactive] [] [--exec ] [--onto ] - [ []] +'git rebase' [-i | --interactive] [] [--exec ] + [--onto | --keep-base] [ []] 'git rebase' [-i | --interactive] [] [--exec ] [--onto ] --root [] 'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch @@ -217,6 +217,24 @@ As a special case, you may use "A\...B" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD. +--keep-base:: + Set the starting point at which to create the new commits to the + merge base of . Running + 'git rebase --keep-base ' is equivalent to + running 'git rebase --onto ... '. ++ +This option is useful in the case where one is developing a feature on +top of an upstream branch. While the feature is being worked on, the +upstream branch may advance and it may not be the best idea to keep +rebasing on top of the upstream but to keep the base commit as-is. ++ +Although both this option and --fork-point find the merge base between + and , this option uses the merge base as the _starting +point_ on which new commits will be created, whereas --fork-point uses +the merge base to determine the _set of commits_ which will be rebased. ++ +See also INCOMPATIBLE OPTIONS below. + :: Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured @@ -364,6 +382,10 @@ ends up being empty, the will be used as a fallback. + If either or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`. ++ +If your branch was based on but was rewound and +your branch contains commits which were dropped, this option can be used +with `--keep-base` in order to drop those commits from your branch. --ignore-whitespace:: --whitespace=