From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) 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 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 59CE91F42D for ; Wed, 23 May 2018 17:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933897AbeEWRf0 (ORCPT ); Wed, 23 May 2018 13:35:26 -0400 Received: from cloud.peff.net ([104.130.231.41]:50390 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932667AbeEWRfZ (ORCPT ); Wed, 23 May 2018 13:35:25 -0400 Received: (qmail 16749 invoked by uid 109); 23 May 2018 17:35:26 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Wed, 23 May 2018 17:35:26 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 16882 invoked by uid 111); 23 May 2018 17:35:34 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) SMTP; Wed, 23 May 2018 13:35:34 -0400 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Wed, 23 May 2018 13:35:23 -0400 Date: Wed, 23 May 2018 13:35:23 -0400 From: Jeff King To: SZEDER =?utf-8?B?R8OhYm9y?= Cc: Junio C Hamano , Kevin Bracey , Git mailing list Subject: Re: Weird revision walk behaviour Message-ID: <20180523173523.GB10299@sigill.intra.peff.net> References: <20180523173246.GA10299@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180523173246.GA10299@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, May 23, 2018 at 01:32:46PM -0400, Jeff King wrote: > On Wed, May 23, 2018 at 07:10:58PM +0200, SZEDER Gábor wrote: > > > $ git log --oneline master..ba95710a3b -- ci/ > > ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 > > > > But as far as I can tell, there are no changes in the 'ci/' directory > > on any of the merge's parents: > > > > $ git log --oneline master..ea44c0a594^1 -- ci/ > > # Nothing. > > $ git log --oneline master..ea44c0a594^2 -- ci/ > > # Nothing! > > Hmm. That commit does touch "ci/" with respect to one of its parents. > It should get simplified away because it completely matches the other > parent, so it does sound like a bug. > > > This is not specific to the 'ci/' directory, it seems that any > > untouched directory does the trick: > > > > $ git log --oneline master..ea44c0a594 -- contrib/coccinelle/ t/lib-httpd/ > > ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 > > Both of those directories also differ between one parent. If you try it > with "contrib/remote-helpers", which does not, then the commit does not > appear. > > So it does seem like a bug where we should be simplifying away the merge > but are not (or I'm missing the corner case, too ;) ). > > > I get the same behavior with Git built from current master and from > > past releases as well (tried it as far back as v2.0.0). > > I keep some older builds around, and it does not reproduce with v1.6.6.3 > (that's my usual goto for "old"). Bisecting turns up d0af663e42 > (revision.c: Make --full-history consider more merges, 2013-05-16). It > looks like an unintended change (the commit message claims that the > non-full-history case shouldn't be affected). There's more discussion in the thread at: https://public-inbox.org/git/1366658602-12254-1-git-send-email-kevin@bracey.fi/ I haven't absorbed it all yet, but I'm adding Junio to the cc. -Peff