From patchwork Mon Dec 23 18:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11308637 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FAD017EE for ; Mon, 23 Dec 2019 18:50:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A87B2073A for ; Mon, 23 Dec 2019 18:50:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N7CzNyyU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726928AbfLWSuM (ORCPT ); Mon, 23 Dec 2019 13:50:12 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41902 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726884AbfLWSuI (ORCPT ); Mon, 23 Dec 2019 13:50:08 -0500 Received: by mail-ed1-f68.google.com with SMTP id c26so16113541eds.8 for ; Mon, 23 Dec 2019 10:50:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=ckHsml5tF8rbwrITNsBewcKB/RzAcohGKcZWm6pvdhc=; b=N7CzNyyUBFjIKp6TcFAmumdMqvHwek8zfsvVo3bRsaILY5Otxlvqp2iBzt5mJMAGw9 wJqO1AyEe5f0HXJrlQWkbAAL0/tN3qWksa76uwBXwY1VllgZwpHe095aasLdKQ00/b4a aJgUn2eBOKEFlcYHB0q/0cCOJu3QzHJpulyc8yZ0dy1mBbKzt+VNaM8b94zjSyrVnxJL s2IdnBZmD7p8DmInVngvumN7Jsbcu9ZzTvYhgRdW0ww+kEWQwjCvgWqcJ9TomRhu5hAH YlrECxWbMGwy4HARr+Q+k4PiI01bDx2dZrIQpfaqLGIInk0KskwiXVuhszNXuX9C98UY Vc5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=ckHsml5tF8rbwrITNsBewcKB/RzAcohGKcZWm6pvdhc=; b=p0tiijd6u4sAVN/Y0GfG3eGUimV056quHVKL95F+42Z3KcaNBmEwtkoXQEfBfYoPNw ZYMQj4L6UEt2dXRowP/Z/HtkKmNzBVyYVvlY4PFWqPjzZP1o5ynmGdAO/cUNTG5YSEwG sxCexBzhc5qT9t2LKotamQvDL+CiburEO0zhKTJlnvfrzso3/ZuZcnJmOc+C53xEENkS fJw9uDJnL7tFb9LHSENe+jxhxELjD3/ddQq+0pOLb28e910L8Lk9GIBaRYJxV/Q7wMle qCgzdzoKSyhvEAw/4DfmnJQQWcB65VS2k+J4D4B+EcXmUICw7ujvDwS8hQ7fJEKduP7O DouA== X-Gm-Message-State: APjAAAXuHMCvnz36e4+YOU2sNiWPbqhJGQxkomV6wyAdYsWH5tZbRgUv EBb/pGB5dRqpmOGhib/5jtOD+zKW X-Google-Smtp-Source: APXvYqycfd42q5FdHg2JUFxc53qPuixWf+UblMbyOBcf5wwwaDCiwUIBD779MV/uJHTjRif8rRdOMA== X-Received: by 2002:a17:906:2651:: with SMTP id i17mr33419919ejc.246.1577127006282; Mon, 23 Dec 2019 10:50:06 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u13sm2384708ejz.69.2019.12.23.10.50.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 10:50:05 -0800 (PST) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Mon, 23 Dec 2019 18:49:51 +0000 Subject: [PATCH v2 07/15] rebase: allow more types of rebases to fast-forward Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk, liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com, alban.gruin@gmail.com, szeder.dev@gmail.com, Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren In the past, we dis-allowed rebases using the interactive backend from performing a fast-forward to short-circuit the rebase operation. This made sense for explicitly interactive rebases and some implicitly interactive rebases, but certainly became overly stringent when the merge backend was re-implemented via the interactive backend. Just as the am-based rebase has always had to disable the fast-forward based on a variety of conditions or flags (e.g. --signoff, --whitespace, etc.), we need to do the same but now with a few more options. However, continuing to use REBASE_FORCE for tracking this is problematic because the interactive backend used it for a different purpose. (When REBASE_FORCE wasn't set, the interactive backend would not fast-forward the whole series but would fast-forward individual "pick" commits at the beginning of the todo list, and then a squash or something would cause it to start generating new commits.) So, introduce a new allow_preemptive_ff flag contained within cmd_rebase() and use it to track whether we are going to allow a pre-emptive fast-forward that short-circuits the whole rebase. Signed-off-by: Elijah Newren --- builtin/rebase.c | 18 ++++++++++++++---- t/t3432-rebase-fast-forward.sh | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index f1de5c8186..7027e34567 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1493,6 +1493,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct object_id squash_onto; char *squash_onto_name = NULL; int reschedule_failed_exec = -1; + int allow_preemptive_ff = 1; struct option builtin_rebase_options[] = { OPT_STRING(0, "onto", &options.onto_name, N_("revision"), @@ -1804,11 +1805,18 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.ignore_date) options.flags |= REBASE_FORCE; + if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) || + (action != ACTION_NONE) || + (exec.nr > 0) || + options.autosquash) { + allow_preemptive_ff = 0; + } + for (i = 0; i < options.git_am_opts.argc; i++) { const char *option = options.git_am_opts.argv[i], *p; if (!strcmp(option, "--whitespace=fix") || !strcmp(option, "--whitespace=strip")) - options.flags |= REBASE_FORCE; + allow_preemptive_ff = 0; else if (skip_prefix(option, "-C", &p)) { while (*p) if (!isdigit(*(p++))) @@ -2144,12 +2152,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) /* * Check if we are already based on onto with linear history, * in which case we could fast-forward without replacing the commits - * with new commits recreated by replaying their changes. This - * optimization must not be done if this is an interactive rebase. + * with new commits recreated by replaying their changes. + * + * Note that can_fast_forward() initializes merge_base, so we have to + * call it before checking allow_preemptive_ff. */ if (can_fast_forward(options.onto, options.upstream, options.restrict_revision, &options.orig_head, &merge_base) && - !is_interactive(&options)) { + allow_preemptive_ff) { int flag; if (!(options.flags & REBASE_FORCE)) { diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh index 7432c0e241..40388ccf9f 100755 --- a/t/t3432-rebase-fast-forward.sh +++ b/t/t3432-rebase-fast-forward.sh @@ -30,6 +30,8 @@ test_rebase_same_head () { shift && test_rebase_same_head_ $status_n $what_n $cmp_n "" "$*" && test_rebase_same_head_ $status_f $what_f $cmp_f " --no-ff" "$*" + test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && + test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" } test_rebase_same_head_ () {