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, 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 D5F9B1F487 for ; Thu, 26 Mar 2020 07:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbgCZH2m (ORCPT ); Thu, 26 Mar 2020 03:28:42 -0400 Received: from cloud.peff.net ([104.130.231.41]:51790 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1726279AbgCZH2m (ORCPT ); Thu, 26 Mar 2020 03:28:42 -0400 Received: (qmail 32705 invoked by uid 109); 26 Mar 2020 07:28:41 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Thu, 26 Mar 2020 07:28:41 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 11705 invoked by uid 111); 26 Mar 2020 07:38:35 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Thu, 26 Mar 2020 03:38:35 -0400 Authentication-Results: peff.net; auth=none Date: Thu, 26 Mar 2020 03:28:40 -0400 From: Jeff King To: Elijah Newren Cc: Norbert Kiesel , Git Mailing List Subject: Re: "git rebase" behavior change in 2.26.0 Message-ID: <20200326072840.GA2198456@coredump.intra.peff.net> References: <20200325053908.GC651138@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Mar 25, 2020 at 11:32:31PM -0700, Elijah Newren wrote: > > 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? Good find. :) Looks like this is due to a6d7eb2c7a (pull: optionally rebase submodules (remote submodule changes only), 2017-06-23) which changed the early return to "ret =". I think it would be an OK size for a micro-project, but it seems like a bug which we may want fixed sooner rather than waiting for somebody to pick it up from the micro-project pile. Or perhaps not. AFAICT this has been there for 2+ years without anybody noticing. -Peff