From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 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, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 5584D1F731 for ; Wed, 31 Jul 2019 15:18:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728960AbfGaPSy (ORCPT ); Wed, 31 Jul 2019 11:18:54 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35114 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728885AbfGaPSx (ORCPT ); Wed, 31 Jul 2019 11:18:53 -0400 Received: by mail-wr1-f65.google.com with SMTP id y4so70136895wrm.2 for ; Wed, 31 Jul 2019 08:18:51 -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=63iYSKF0eoUC77xVGKOShHozOMN5BMH0IRg65gdnKxU=; b=EaNQRtPXJ77ifCfIQmAkHTgdp19qJcV909OmObb+wQv5jjhcDUr90ogbu1Aryq2QTy 2rQ0v2aryZl65dpgf0EKoeQBt5x8iNqPP/iEvoU5Udc3zshE7gcmW+RHHL+oCeLgey5E bIdjntKqfM74bv80E8BthVEyg9V2pyR20cSzjWSXAlVuzId6SBsoLoQor8Vf2XtSDI9T HlruRtoMnaGcD7HnbpKLLNG1K/QA6XHdtfcFSo3BtPlZJM6TYoLUgyPuZaUgvFOS9w0D EYI/5TqTwCTE56aJntVvatCkMcmGYhgaI+dDifQMz9Rxy6EPL+LXUjpt3EeBIJx8Wz6D 05rw== 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=63iYSKF0eoUC77xVGKOShHozOMN5BMH0IRg65gdnKxU=; b=hZIKz/Q6EVPmdQq7etyUQg1HM2Vsluw81JYLEf11XoflSZRL/aZdb4dEeyfDdaL0Hp dVK6YISxKoKnDBk0I3YmMoNTKXuEcWyfW2MUruMjfsk+XbBzdvlfknXApwofiV1tDiCi A8ys10oA+3zyfDT2WXAR1jqIqTGrqbhYd2fySK3t8skbTGf4LRVHn+H4RK9y/s1mzfMv bvlYccWZlyRC2gmM3NE2I1gzyESNtYJlAcc2deMlL8fnKM9SOY387qQPZf3J7eHlMB/B yvGcz0LAYfYTkpDQpuJkJZyIKhZQfz6Tfa7KH6WO5YdaZwxB6D01+hPgZFBD+sTpdOb3 0txw== X-Gm-Message-State: APjAAAWAJrAa8JIqXj1SaTmVTCMMpoE2fe70OcqyyEB+Z7VusESXhvTv EMAhCmA9X/MQghHJVDmvQEyABBln X-Google-Smtp-Source: APXvYqwMsU4/z0QY1GZPoxeE07CR/ghFXQgvcTaDtokSYqx1+yFjSpAisOj8zKQCCmPBzb5xltdeLQ== X-Received: by 2002:adf:f94a:: with SMTP id q10mr1498095wrr.341.1564586330278; Wed, 31 Jul 2019 08:18:50 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f192sm71047282wmg.30.2019.07.31.08.18.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jul 2019 08:18:49 -0700 (PDT) Date: Wed, 31 Jul 2019 08:18:49 -0700 (PDT) X-Google-Original-Date: Wed, 31 Jul 2019 15:18:36 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 16/16] rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: "brian m. carlson" , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin When rebasing a complete commit history onto a given commit, it is pretty obvious that the root commits should be rebased on top of said given commit. To test this, let's kill two birds with one stone and add a test case to t3427-rebase-subtree.sh that not only demonstrates that this works, but also that `git rebase -r` works with merge strategies now. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 7 +++++-- sequencer.c | 4 +++- sequencer.h | 6 ++++++ t/t3427-rebase-subtree.sh | 11 +++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 625f50c637..ee2bc8b032 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -62,7 +62,7 @@ struct rebase_options { const char *onto_name; const char *revisions; const char *switch_to; - int root; + int root, root_with_onto; struct object_id *squash_onto; struct commit *restrict_revision; int dont_finish_rebase; @@ -374,6 +374,7 @@ static int run_rebase_interactive(struct rebase_options *opts, flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0; flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0; flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0; + flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0; flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0; switch (command) { @@ -1841,7 +1842,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.squash_onto = &squash_onto; options.onto_name = squash_onto_name = xstrdup(oid_to_hex(&squash_onto)); - } + } else + options.root_with_onto = 1; + options.upstream_name = NULL; options.upstream = NULL; if (argc > 1) diff --git a/sequencer.c b/sequencer.c index d228448cd8..ca119c84e5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4440,6 +4440,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, { int keep_empty = flags & TODO_LIST_KEEP_EMPTY; int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS; + int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO; struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT; struct strbuf label = STRBUF_INIT; struct commit_list *commits = NULL, **tail = &commits, *iter; @@ -4606,7 +4607,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, if (!commit) strbuf_addf(out, "%s %s\n", cmd_reset, - rebase_cousins ? "onto" : "[new root]"); + rebase_cousins || root_with_onto ? + "onto" : "[new root]"); else { const char *to = NULL; diff --git a/sequencer.h b/sequencer.h index 0c494b83d4..d506081d3c 100644 --- a/sequencer.h +++ b/sequencer.h @@ -142,6 +142,12 @@ int sequencer_remove_state(struct replay_opts *opts); */ #define TODO_LIST_REBASE_COUSINS (1U << 4) #define TODO_LIST_APPEND_TODO_HELP (1U << 5) +/* + * When generating a script that rebases merges with `--root` *and* with + * `--onto`, we do not want to re-generate the root commits. + */ +#define TODO_LIST_ROOT_WITH_ONTO (1U << 6) + int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, const char **argv, unsigned flags); diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 7a37235768..39e348de16 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -93,4 +93,15 @@ test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' ' verbose test "$(commit_message HEAD)" = "Empty commit" ' +test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' ' + reset_rebase && + git checkout -b rebase-merges-onto to-rebase && + test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root && + : first pick results in no changes && + git rebase --continue && + verbose test "$(commit_message HEAD~2)" = "master4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + verbose test "$(commit_message HEAD)" = "Empty commit" +' + test_done -- gitgitgadget