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 365501F487 for ; Fri, 27 Mar 2020 20:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727593AbgC0U7o (ORCPT ); Fri, 27 Mar 2020 16:59:44 -0400 Received: from mail-ot1-f46.google.com ([209.85.210.46]:35609 "EHLO mail-ot1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726959AbgC0U7o (ORCPT ); Fri, 27 Mar 2020 16:59:44 -0400 Received: by mail-ot1-f46.google.com with SMTP id v2so6699834oto.2 for ; Fri, 27 Mar 2020 13:59:43 -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=V9bxnt74yMohZ2vXycxFZgqyXuk2e9X1FyHUj6kO2G8=; b=tWTyDriezARhRy5gVxlrAn2naPiXp4f61QGJXQ/vIyHxxwPffKB5TvGcBzN14/zxQ6 Nw+bNJOtwK9lJsvTPS57+jPkP9uLq4O9mGY6sUDYYii3Udh1NvcJYus7SvpN8/2MUc+g x+M3VhxDq4DjS5Ehuf4eQOdGqh228qRjCGBo22pCWPnxqnez4qxsk60vlhjaf3ZE2iKa dmuuTXL7HY8HmfBA+TSsb1oPYoErI9lKMupdlLGWz8VXZ9Y2v+XPva8fKY45A97SEtRw mSVamKT9hqwHw2UghRDqrUgi82T62Jry7KDVLqg7TVezTjwMxaIUenbllJw8r8o8nm71 kOLA== 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=V9bxnt74yMohZ2vXycxFZgqyXuk2e9X1FyHUj6kO2G8=; b=FMnJQQTEtNTsLyNkZS1YPy7XyTXXHtZbi1WyCFtxUw5Ye+PwO43Ju9E16Nc5toP2DY r82v4qKV5RMc22F6tf75AoeZU6cLhi6W5KcMrycP34nmEahvH2ReqEAX8R6D7nxxDWwA z1MLfiDrb96wc8Us9Tml9adfjVX1k9coz7FXJ/59Z6ZNIsKG7FGE2+YD8dUzoEMAXB+H OFGeSb7JgOcgpGQljFF8e9aATn40ymMoWtS8OxMH71ZnG6tzV6KC6ZW3yQ+HyGZUi1ct lVvxCc89cVa+l5osf4MyX5Is23+0GfysT0D3uNjFJklloQpWJnhRYph22tnTIVpr4La5 bN7A== X-Gm-Message-State: ANhLgQ0ji4gpj2uPFm/RuJMHkIY0GDMPHVh/K18Wi3p4TezIwc7wk6bm qhZkMocHBqJkCnCuTDlqU+Hy32IlpfEV3YPvu+Y= X-Google-Smtp-Source: ADFU+vvMxUMRAvr6zz02azdRER8ibrkT7z022PJcpmnj+ThCfVe8U33Jj8hZfYG8hIhlIumLy5Vwe8T6+KQk4T7QtuU= X-Received: by 2002:a9d:6457:: with SMTP id m23mr514928otl.162.1585342783077; Fri, 27 Mar 2020 13:59:43 -0700 (PDT) MIME-Version: 1.0 References: <20200325053908.GC651138@coredump.intra.peff.net> <20200326072840.GA2198456@coredump.intra.peff.net> In-Reply-To: From: Elijah Newren Date: Fri, 27 Mar 2020 13:59:31 -0700 Message-ID: Subject: Re: "git rebase" behavior change in 2.26.0 To: Norbert Kiesel Cc: Jeff King , Git Mailing List 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 Fri, Mar 27, 2020 at 11:34 AM Elijah Newren wrote: > > On Fri, Mar 27, 2020 at 11:01 AM Norbert Kiesel wrote: > > ... > What's in your .git/config, and in your $HOME/.gitconfig? (Or maybe > just the output of 'git config --list'?) > What hooks do you have setup in .git/hooks/? After some off-thread discussion due to concerns with sharing his configuration globally... Ahah, so I can duplicate when using both pull.rebase=true and rebase.autosquash=true. rebase.autosquash in the rebase code sets allow_preemptive_ff to 0, meaning it disables rebase from fast-forwarding. That would have been fine if we only ran a rebase, but we ran both a merge and a rebase and thus updated ORIG_HEAD *twice*. So, the "extra" bug I found upthread (pull runs both merge and rebase for a fast-forward) isn't an extra bug but is *the* bug in question. It's been with us for a few years as Jeff pointed out, but just was uncovered due to the other recent 2.26 changes. Patch incoming soon.