From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jul 2023 18:30:42 +0000 (-0700)
Subject: Merge branch 'jc/pathspec-match-with-common-prefix'
X-Git-Tag: v2.42.0-rc0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13ed10efd422fe143a4d732100c25a6c6c60f656;p=thirdparty%2Fgit.git

Merge branch 'jc/pathspec-match-with-common-prefix'

"git ls-files '(attr:X)D/'" that triggers the common prefix
optimization codepath failed to read from "D/.gitattributes",
which has been corrected.

* jc/pathspec-match-with-common-prefix:
  dir: match "attr" pathspec magic with correct paths
  t6135: attr magic with path pattern
---

13ed10efd422fe143a4d732100c25a6c6c60f656