From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 0A9DC1F428 for ; Fri, 17 Mar 2023 16:47:20 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.a=rsa-sha256 header.s=fm1 header.b=kiCmCTv4; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=hC7jQx62; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbjCQQrQ (ORCPT ); Fri, 17 Mar 2023 12:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbjCQQrN (ORCPT ); Fri, 17 Mar 2023 12:47:13 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 401589AFFC for ; Fri, 17 Mar 2023 09:46:51 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 643D03200920; Fri, 17 Mar 2023 12:46:48 -0400 (EDT) Received: from imap46 ([10.202.2.96]) by compute6.internal (MEProxy); Fri, 17 Mar 2023 12:46:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1679071608; x=1679158008; bh=S3 zntSBY67IV1X+vfHfL1qIyryVpR3h9NrLMhqpkx4A=; b=kiCmCTv4/neP9R00S4 SJKrvjMmR5o0YNcZdsLdTkP7/qz1gjivaQIawbu1CisApXGO5mVSqYCWhrfGChzr XPA3PSkL0wrpvix1ioP3rayW4avTjTWJm9k5N2X7rv92l2wLtbSmEKM5fKXOzvUt WF2kuJTKKKSO1rf6/XyZYWlufD7oaHaHvMsOq7eEOS1ABCCno0P/e24kM31mDHx/ QVodxoHU4/9j5ilhb0eoVDruT282ZO36YWCkijhWIfLfMlpgFvJEMvl27ANmjZ3L Xaxpm+Z9oyqjov0cDi9MuGIjOC+lR2lMbXdTBs/EX0cQ54cPVYa9MW4rkIco7tVq 518w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1679071608; x=1679158008; bh=S3zntSBY67IV1 X+vfHfL1qIyryVpR3h9NrLMhqpkx4A=; b=hC7jQx62Ctb7UwdQk06TOLdjQPK2Y S7MIf9RO/cUthpP+60VDbyrSQOB61YfDEO+hnG3TUvwdqNeQKNCJP6KghZgSVGb0 i1ckbp7EGHcUCplPiiscwnih6lRYDkjDqMzUX185Yjy5Gaj+nl19oreJWLUWTaH5 gTFEDNSYw/vitCGjf8HbnxNL30akbssTNmkX9CojkAIY/uCDFoySoS8q1gnEbQxA vzntjqN6qSXfQRoA8a83e72wQXc63iokHSjDtmHNHzbFK1eLVqzdbgHHOze5ZIzZ bJZ3682WoRnBJVKkn+XbLeh8M0x5Q4Rv4acETMIcsWYUqLT0IESCgkcyg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdefvddgledvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvvefutgesth dtredtreertdenucfhrhhomhepfdforghtthhhvgifucffvgggohhrvgdfuceomhgrthhv ohhrvgesphhosghogidrtghomheqnecuggftrfgrthhtvghrnhepgefgueelveejfedvie fgvdetteehhfeuuefhffettdegkeffgfeuleevhfehgffgnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrthhvohhrvgesphhosghogidrtg homh X-ME-Proxy: Feedback-ID: iba91467a:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id CF2BB2A20080; Fri, 17 Mar 2023 12:46:47 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-221-gec32977366-fm-20230306.001-gec329773 Mime-Version: 1.0 Message-Id: In-Reply-To: References: <4c02cd71-8bfc-4b6e-9ec0-3d98598a695a@app.fastmail.com> Date: Fri, 17 Mar 2023 11:46:26 -0500 From: "Matthew DeVore" To: "Jeff King" Cc: git@vger.kernel.org Subject: Re: Buggy `git log -- path` behavior Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Mar 15, 2023, at 12:07, Jeff King wrote: > I think what you're seeing is the correct output, though, due to history > simplification. Along the first-parent history, for example, > Documentation/vm/pagemap.rst never existed. And so since it does not > exist now, we prune any side branches where it did (because they did not > lead to the current state; the other side of the merge resolution did). > > Tracking down the exact sequence of merges is tricky ("git log --graph" > is unreadably huge here). But it looks like the file was added by > ad56b738c5dd (docs/vm: rename documentation files to .rst, 2018-03-21). > That was merged into docs-next via 24844fd33945 (Merge branch 'mm-rst' > into docs-next, 2018-04-16), which then eventually moved it in > 1ad1335dc586 (docs/admin-guide/mm: start moving here files from > Documentation/vm, 2018-04-18). This was thought-provoking. ad56b738c5dd is a side-branch. I expected a path filter to find changes since git log would show this commit when invoked with no other args. But the only reason git follows the side branch in the filterless or 'pagemap.*' case is because git sees pagemap.txt (matching the glob) in the first-parent line being removed when the side branch is merged into this first-parent line. As I usually use --name-status as a default in my workflow, I was surprised git log couldn't find something that grep could :) Thank you for the thorough explanation despite my terse complaint.