From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4BEB61F51C for ; Tue, 22 May 2018 13:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751350AbeEVNby (ORCPT ); Tue, 22 May 2018 09:31:54 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:41167 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbeEVNbs (ORCPT ); Tue, 22 May 2018 09:31:48 -0400 Received: by mail-wr0-f196.google.com with SMTP id u12-v6so1202477wrn.8 for ; Tue, 22 May 2018 06:31:47 -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:in-reply-to:references; bh=UgWZwwHf9jHjy4LAeVyEh0E9njw41iEHuTSaKLlVslI=; b=gIKYQWip1ABwRf1EJQml+U2ywf+W1ncpBKDmTP+FFgGfJzZam0ounj9a52UkyPV8KZ bi881Qzs+AyJgoQWAkzE5LOvSwnNVcBAp2rU5yLfIBoCg+BHfFEcJJlly30YtqvwWwgU kF/BjG/WVV8KelqtHehOKBkPJTBkatC+w7r8zxRxALRWwFrYnJfTgFfxfoo51C+15yjU NIyx0S+1K5s7fMRl9I8UC6QGPQtGMI0qZ906/oH5HTGlFwATw1Lp/tTtSKnTfDuhfvpM 0+dHFXAgMqjMPlxfUdOmKCiz17tlx5HKEsSHBRNypG66gdeaucgCitlCvnIYA3NNU8/N ph9w== 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:in-reply-to :references; bh=UgWZwwHf9jHjy4LAeVyEh0E9njw41iEHuTSaKLlVslI=; b=UUQBXLwS+W8MFM9aLmrA+Tqy3IuT5x/uairrM2a7la1dDM9hLpcNB3bgZRr96LgH83 QQXlU5g1tuBNCEpl/L+yOSBNpxHk6SGuIj/bxhlfeaiIQeABB9gG2/kaXRCKEbu5anfy j2peqHov/lq1F8pqZHj7tFbhfdWXQcdNsEfhGD4ekQtwmGRiUFXt4W3HaPsJyuSOKu8T FcJ2ksi8U4tc96ipe7+oziGXfN7zNbvo+dS5cPjqMKdTbc4Zg55Jc4WIwL4fUKNhOaiT 00DVhYgDi4dxkrspwdOGlDdEeog3NilbW22IAaHCzEd6IbKfL3LiMetyIlGjjX4VdEmK WWag== X-Gm-Message-State: ALKqPweT144qroeD4r33tONYmcVY+shv0F2umLPEYYHhRZWNtjVqDBHq IGC+dZNP6wddMvv7EmfvvtHex2sFHUs= X-Google-Smtp-Source: AB8JxZoTBaO2kmO/SsGFBvu2mcg9l5f6ZntRrKkuI2HNiyosWPdICOYbwGjkLRBGWpgPBra6IETQTQ== X-Received: by 2002:adf:e582:: with SMTP id l2-v6mr12975410wrm.229.1526995906882; Tue, 22 May 2018 06:31:46 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-45-152.w86-221.abo.wanadoo.fr. [86.221.52.152]) by smtp.googlemail.com with ESMTPSA id w40-v6sm29109785wrc.69.2018.05.22.06.31.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 06:31:46 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, Wink Saville , Alban Gruin Subject: [GSoC][PATCH 3/4] rebase: use the new git-rebase--preserve-merges.sh Date: Tue, 22 May 2018 15:31:09 +0200 Message-Id: <20180522133110.32723-4-alban.gruin@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180522133110.32723-1-alban.gruin@gmail.com> References: <20180522133110.32723-1-alban.gruin@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Creates a new type of rebase, "preserve-merges", used when rebase is called with -p. Before that, the type for preserve-merges was "interactive", and some places of this script compared $type to "interactive". Instead, the code now checks if $interactive_rebase is empty or not, as it is set to "explicit" when calling an interactive rebase (and, possibly, one of its submodes), and "implied" when calling one of its submodes (eg. preserve-merges) *without* interactive rebase. It also detects the presence of the directory "$merge_dir"/rewritten left by the preserve-merges script when calling rebase --continue, --skip, etc., and, if it exists, sets the rebase mode to preserve-merges. In this case, interactive_rebase is set to "explicit", as "implied" would break some tests. Signed-off-by: Alban Gruin --- git-rebase.sh | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 40be59ecc..19bdebb48 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -207,7 +207,14 @@ run_specific_rebase () { autosquash= fi . git-rebase--$type - git_rebase__$type${preserve_merges:+__preserve_merges} + + if test -z "$preserve_merges" + then + git_rebase__$type + else + git_rebase__preserve_merges + fi + ret=$? if test $ret -eq 0 then @@ -239,7 +246,12 @@ then state_dir="$apply_dir" elif test -d "$merge_dir" then - if test -f "$merge_dir"/interactive + if test -d "$merge_dir"/rewritten + then + type=preserve-merges + interactive_rebase=explicit + preserve_merges=t + elif test -f "$merge_dir"/interactive then type=interactive interactive_rebase=explicit @@ -402,14 +414,14 @@ if test -n "$action" then test -z "$in_progress" && die "$(gettext "No rebase in progress?")" # Only interactive rebase uses detailed reflog messages - if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase + if test -n "$interactive_rebase" && test "$GIT_REFLOG_ACTION" = rebase then GIT_REFLOG_ACTION="rebase -i ($action)" export GIT_REFLOG_ACTION fi fi -if test "$action" = "edit-todo" && test "$type" != "interactive" +if test "$action" = "edit-todo" && test -z "$interactive_rebase" then die "$(gettext "The --edit-todo action can only be used during interactive rebase.")" fi @@ -487,7 +499,13 @@ fi if test -n "$interactive_rebase" then - type=interactive + if test -z "$preserve_merges" + then + type=interactive + else + type=preserve-merges + fi + state_dir="$merge_dir" elif test -n "$do_merge" then @@ -647,7 +665,7 @@ require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")" # but this should be done only when upstream and onto are the same # and if this is not an interactive rebase. mb=$(git merge-base "$onto" "$orig_head") -if test "$type" != interactive && test "$upstream" = "$onto" && +if test -z "$interactive_rebase" && test "$upstream" = "$onto" && test "$mb" = "$onto" && test -z "$restrict_revision" && # linear history? ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null @@ -691,7 +709,7 @@ then GIT_PAGER='' git diff --stat --summary "$mb" "$onto" fi -test "$type" = interactive && run_specific_rebase +test -n "$interactive_rebase" && run_specific_rebase # Detach HEAD and reset the tree say "$(gettext "First, rewinding head to replay your work on top of it...")" -- 2.16.1