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.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, 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 9CF0B1F487 for ; Fri, 27 Mar 2020 18:01:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726959AbgC0SBn (ORCPT ); Fri, 27 Mar 2020 14:01:43 -0400 Received: from mail-ot1-f43.google.com ([209.85.210.43]:35926 "EHLO mail-ot1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726770AbgC0SBn (ORCPT ); Fri, 27 Mar 2020 14:01:43 -0400 Received: by mail-ot1-f43.google.com with SMTP id l23so10683346otf.3 for ; Fri, 27 Mar 2020 11:01: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=y3wFBRAAtnpmUXIzV7AvQO2JZGJ4X0LNx8kn6EAzoYA=; b=Qq6EX08kHLhKGxU0sKGX+KQPjDwKgwi+NeaQhiuBFjhE6nq9pYCuCp2D+tmdqnfY4M +YAIviwmur4oAPH9WWCr/I+vnE9GYks1I1To2prg/JoTpxn9F2konjvNKRIDWbGolbB9 7YdPjki52CUyKcOcePWiwKqKWkfqbolN0EK0x/q6cesOi5bZVmxBzzkCBwKUN7vc0z3V IwBUYOXJZ/XtzLT7NoZRn+yoSg3uuWFRBrd7P2I+AqxucnHQmZ+YvzMoGMT2c7M8bejh Dbh9iDIBoCI8DWc0QMyD4HKB52nD/tvk2wIe8V3HsF39jJyTXQhvtoxWx1oe0E4I2CnA 2/HQ== 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=y3wFBRAAtnpmUXIzV7AvQO2JZGJ4X0LNx8kn6EAzoYA=; b=aiYSx0LzLGkbJnLe7Hkw5V/II+AbnZqbw+1aXYFZyapwbCVWFhWFg6hPBjNBICVDnf sjRoxmN7pDvFPikMZ+sDdCdlnRb+xce0ugJpoYMOkALJMGodos9yGKQJxVSMU+C+7oAz lQDL1YLB+emqg+3tj5dY/0TMGDL5Jf9RG4+V+TsBCP/JulThOrH/mg/KLn3Ipxxjhrqe I6DFFSAYN9LLlJwL0MkMRUjBsdgvEW7zYdDOsTbXN/rGZq5JI437Py66uDjoqeryKSys XTCk/r3gaQttbLd+gY45sR1DA44bNpAPAUMJoqzv7J2/JNufp4SGXg3diHg7w9BcHIkq F+Tw== X-Gm-Message-State: ANhLgQ0YxvzbJJx943HJ0zjdP3O2SlN2cYc/pdlNSRYEIOpSPGUk/UN9 fHhMr60VWDU9wPthAFvINaPlmzXaW+y5iw+jPK0= X-Google-Smtp-Source: ADFU+vu2vSnHw5Ov5JBqSgn93t0RideFpnrlMNDtI9UcASnj/Ts63D60TBhys9xXdMKkaOpL1gNSZwl9lBbLcb6/t7s= X-Received: by 2002:a4a:3e90:: with SMTP id t138mr532261oot.24.1585332102079; Fri, 27 Mar 2020 11:01:42 -0700 (PDT) MIME-Version: 1.0 References: <20200325053908.GC651138@coredump.intra.peff.net> <20200326072840.GA2198456@coredump.intra.peff.net> In-Reply-To: From: Norbert Kiesel Date: Fri, 27 Mar 2020 11:01:30 -0700 Message-ID: Subject: Re: "git rebase" behavior change in 2.26.0 To: Jeff King Cc: Elijah Newren , 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 I ran a "pull" today morning w/o sufficient coffee and thus forgot to disable the "pull.rebase" and was bitten by that again. Here is what I see when using "GIT_TRACE2=1 git -c pull.rebase=true pull --ff-only": ... 10:54:50.578673 run-command.c:735 child_start[2] git merge --ff-only FETCH_HEAD 10:54:50.580385 common-main.c:48 version 2.26.0 10:54:50.580404 common-main.c:49 start /usr/lib/git-core/git merge --ff-only FETCH_HEAD 10:54:50.580587 repository.c:130 worktree /home/nkiesel/work/Platform 10:54:50.580785 git.c:440 cmd_name merge (pull/merge) Already up to date. 10:54:50.589803 git.c:674 exit elapsed:0.009835 code:0 10:54:50.589827 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.009874 code:0 10:54:50.590887 run-command.c:990 child_exit[2] pid:939370 code:0 elapsed:0.012205 10:54:50.590919 run-command.c:735 child_start[3] git rebase --onto d0527895a4df44f00162b68011b803e597fd400f d0527895a4df44f00162b68011b803e597fd400f 10:54:50.592396 common-main.c:48 version 2.26.0 10:54:50.592412 common-main.c:49 start /usr/lib/git-core/git rebase --onto d0527895a4df44f00162b68011b803e597fd400f d0527895a4df44f00162b68011b803e597fd400f 10:54:50.592568 repository.c:130 worktree /home/nkiesel/work/Platform 10:54:50.592714 git.c:440 cmd_name rebase (pull/rebase) 10:54:50.593142 builtin/rebase.c:1669 cmd_mode undefined 10:54:50.614154 run-command.c:735 child_start[0] git checkout d0527895a4df44f00162b68011b803e597fd400f 10:54:50.678813 run-command.c:990 child_exit[0] pid:939392 code:0 elapsed:0.064656 Successfully rebased and updated refs/heads/nextrelease. 10:54:50.697724 git.c:674 exit elapsed:0.105715 code:0 10:54:50.697734 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.105729 code:0 10:54:50.698307 run-command.c:990 child_exit[3] pid:939371 code:0 elapsed:0.107373 10:54:50.698343 git.c:674 exit elapsed:5.904200 code:0 10:54:50.698354 trace2/tr2_tgt_normal.c:123 atexit elapsed:5.904211 code:0 I would argue that "--ff-only" would mean to never rebase, but clearly git runs a rebase of HEAD onto HEAD and i assume by that setting ORIG_HEAD to HEAD as colloquial damage.