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=-3.9 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 6EB3C1F487 for ; Thu, 26 Mar 2020 06:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726180AbgCZGcn (ORCPT ); Thu, 26 Mar 2020 02:32:43 -0400 Received: from mail-oi1-f179.google.com ([209.85.167.179]:36484 "EHLO mail-oi1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbgCZGcn (ORCPT ); Thu, 26 Mar 2020 02:32:43 -0400 Received: by mail-oi1-f179.google.com with SMTP id k18so4593171oib.3 for ; Wed, 25 Mar 2020 23:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8bAWs1QxaJVa/3Z1ZCKHwHxNQWYFRY0Q66HjWfMscPo=; b=oDmbn7iGPibwisdT1+xObghtyWT2nkpk33OB2J/IfQCS0D+86m/oOHEJj/Aqo8RF2a aMW1mgA+K/000wb4IW7oQIVAyOhvVdC+bInIc7QIombgnXo0B9d++b7etLJCoeCfKn60 kfd8eM0m9bFcUyZRR47d/DxolkByzNRfbBWITuE+zPe6RNFUr0yKg1nZcWCwPrLTKJMc P5icBg8I4JiBuVrS+4xruqUXJqMM6UpMyRy3RUMyd849IAeQc8BZdyqBl0InrME0qzGj Fu/vjnJ0nkLLg3VIADHvQHX2TQc9/QHTUon5pEJEJX1bHzAHX5jORlGEAa1Qkl6QW4+8 6Fsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8bAWs1QxaJVa/3Z1ZCKHwHxNQWYFRY0Q66HjWfMscPo=; b=tSLyy4xBWO7ZsrWxKa5Ee87pdNjdix4mvyOR7B3z/PNIKpVSKYmMtlKs2JvkDROxX7 PtWI2ZFWT4wjph8oygdxsUtlmcqyvMDXRIABoq0o6NAMGMY9InR3+jhriAWqeKBpgUNy G8IFIUU9EfLK6pJIj9ePtvm60l2/kd9L01ES+odC796dyxZNtlJSenLJTWPInMEWtEew PINIsnxrmOSFufchVxSGeovrabVtz1Hr6eULFzEp+eVkUq/FUaWwKZAOAwoyR9LMGWpR HTUsV6kqA485R3PcwlidZaGV4uOoHeIMMNMh0WLF/8FtJ0UfDpfS0QfgE4ZR5fIDcNGA rJbQ== X-Gm-Message-State: ANhLgQ1SpJ7pTwzGEx+4ykYzWLHiK4GBlmuaO1FtVUz4PqbwcaQ5zbla 7pvZTlGZqoLxERP/yg+AoC7dFOnQiwkBHGMsnOg= X-Google-Smtp-Source: ADFU+vuMV5Uc/LxH1MBits6RGZ2xOUL69SjBgbl4EWXwBzBz7/JiDYFuljQt2xcS/FnqppHxatXGB5BXlwqArN0Kus0= X-Received: by 2002:aca:dc45:: with SMTP id t66mr832892oig.39.1585204362255; Wed, 25 Mar 2020 23:32:42 -0700 (PDT) MIME-Version: 1.0 References: <20200325053908.GC651138@coredump.intra.peff.net> In-Reply-To: From: Elijah Newren Date: Wed, 25 Mar 2020 23:32:31 -0700 Message-ID: Subject: Re: "git rebase" behavior change in 2.26.0 To: Norbert Kiesel Cc: Git Mailing List , Jeff King Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Mar 25, 2020 at 8:37 PM Elijah Newren wrote: > Now, when I try to duplicate, just for fun I added some 'die("You ran > a merge!")' and 'die("You ran a rebase!")' lines early in > builtin/{merge,rebase}.c, just so I could verify what was run. Then I > tried to use a command line similar to yours: > > $ git -c rebase.backend=merge -c pull.rebase=false -c > branch.master.rebase=true pull > remote: Enumerating objects: 5, done. > remote: Counting objects: 100% (5/5), done. > remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 > Unpacking objects: 100% (3/3), 250 bytes | 250.00 KiB/s, done. > From /home/newren/floss/git/testing/pull-rebase-orig-head/repo > c911eef..2ccdb90 master -> origin/master > fatal: You ran a merge! > fatal: You ran a rebase! > > > Say, WAT?!? This attempted to run both a merge and a rebase? That > appears to be yet another bug. >From git-pull.c: ... if (is_descendant_of(merge_head, list)) { /* we can fast-forward this without invoking rebase */ opt_ff = "--ff-only"; ret = run_merge(); } } ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point); Perhaps that comment should read: /* we can fast-forward this using merge and avoid rebase...but then run rebase afterward anyway! */ Whoops. Perhaps fixing this is a good micro-project candidate? Too small?