From patchwork Mon Apr 1 20:51:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10880557 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 C9B8F14DE for ; Mon, 1 Apr 2019 20:52:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4D0D28749 for ; Mon, 1 Apr 2019 20:52:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A92EC2871A; Mon, 1 Apr 2019 20:52:01 +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 423BE27F3E for ; Mon, 1 Apr 2019 20:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbfDAUv6 (ORCPT ); Mon, 1 Apr 2019 16:51:58 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:44838 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727065AbfDAUv6 (ORCPT ); Mon, 1 Apr 2019 16:51:58 -0400 Received: by mail-pf1-f194.google.com with SMTP id y13so5151963pfm.11 for ; Mon, 01 Apr 2019 13:51:58 -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=tUtsBbdJ83xf7Oc1B53311qtwKkXdib8ELxgEej1L7Q=; b=JRS+C07GJsUjaLvjINPqOypJHDYQL7JNI//GdWpoG8+LyDEzo/UdAEGHSvuRsUQKp7 OksOFoRK2Ixxlk2HuyScL4gxfCzh+i2BD2cuDs6GJU8g8sEH469+oaO7MxrUr/1diwdu iow10OW8dJoe/naY/TNIjMPjCSDCJcfNv2eq7a62GbEY40i5vQ4vn29Daq7atpyXm98x H32G/2hyGdm2q9SZtJIpKzNQTIkJAqY1TaLclXr18tw7hj0Qeur5hhruY5eom3WDVFx9 mbcrYKTjFEcJq3Ik04GXX7cIVHPjUspR+Fzo2Yeg8yFRdTGn8FyQzjUy/HMJwyPgVDwi Ihxg== 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=tUtsBbdJ83xf7Oc1B53311qtwKkXdib8ELxgEej1L7Q=; b=VaNwmYAexAays0cI29ni1oaa9afE+ReQtb6rUXx4mMRo2ytORn5Ad3KRJcNp69ctRl iTERZbHhEeAhXazf7fiRbY4IxQfpwLGx2zKp4UdPbh4Iv7wRpoB7LWUbOGY9glIho+Bd SSrymJgpj0oK/dQadDunRsS2QWO+rVixrpiXwcnFhHWxp/kBy7FAv8qyjo2G3s3FhFsj DdqC1UrNP49yWn9qKuIlFSg+KlYVula48iy1X3ceGrqWjXIuVYPwGsfY47C5gdJPA++z IHhm8mr+D08/TUsmIHlUEV+LZPUnSL/jkDaQYrlSzoGkHbOmKaHe91CscmzzLOskFvvb okCA== X-Gm-Message-State: APjAAAUk7y+p3+TTayjDJ4faubJrGnKsJQ1BHWiJLAEAdj8fI+QZuakv UlyhRR7ANOobSxcloQCW5DfRRMNY X-Google-Smtp-Source: APXvYqyb2wQuqVI5fcTcWvyuBjWJWDMwFo1poETw7TiDrpmdnHIAKRdgx5uomYGFo7HrCFoAuDA53Q== X-Received: by 2002:a62:2fc4:: with SMTP id v187mr66900921pfv.147.1554151917430; Mon, 01 Apr 2019 13:51:57 -0700 (PDT) Received: from dev-l ([149.28.200.39]) by smtp.gmail.com with ESMTPSA id 13sm13703719pfi.172.2019.04.01.13.51.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 13:51:56 -0700 (PDT) Date: Mon, 1 Apr 2019 13:51:54 -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 Subject: [PATCH v3 0/4] rebase: teach rebase --keep-base Message-ID: References: <20190328221745.GA3941@dev-l> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190328221745.GA3941@dev-l> 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 Thanks again for your feedback, Ævar! I think we're both on the same page now. Hopefully I've addressed all of your high-level concerns with this patchset and we can move into a discussion on implementation detail. This patchset now depends "[PATCH 1/8] tests (rebase): spell out the `--keep-empty` option" which is the first patch of Johannes's "Do not use abbreviated options in tests" patchset[1]. (Thanks for catching that, Johannes!) Changes since v1: * Squashed old set into one patch * Fixed indentation style and dangling else * Added more documentation after discussion with Ævar Changes since v2: * Add testing for rebase --fork-point behaviour * Add testing for rebase fast-forward behaviour * Make rebase --onto fast-forward in more cases * Update documentation to include use-case [1]: https://public-inbox.org/git/a1b4b74b9167e279dae4cd8c58fb28d8a714a66a.1553537656.git.gitgitgadget@gmail.com/ Denton Liu (4): t3431: add rebase --fork-point tests t3432: test rebase fast-forward behavior rebase: fast-forward --onto in more cases rebase: teach rebase --keep-base Documentation/git-rebase.txt | 30 +++++++++++-- builtin/rebase.c | 72 +++++++++++++++++++++++--------- t/t3400-rebase.sh | 2 +- t/t3404-rebase-interactive.sh | 2 +- t/t3416-rebase-onto-threedots.sh | 57 +++++++++++++++++++++++++ t/t3431-rebase-fork-point.sh | 57 +++++++++++++++++++++++++ t/t3432-rebase-fast-forward.sh | 62 +++++++++++++++++++++++++++ 7 files changed, 258 insertions(+), 24 deletions(-) create mode 100755 t/t3431-rebase-fork-point.sh create mode 100755 t/t3432-rebase-fast-forward.sh