From: Dakota Hawkins <dakota@dakotahawkins.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, Git <git@vger.kernel.org>
Subject: Re: [PATCH] doc/gitattributes: mention non-recursive behavior
Date: Tue, 20 Mar 2018 00:28:03 -0400 [thread overview]
Message-ID: <CAHnyXxSOvU9aokdyo_UBcHPLeCSogyFCRjxXi9NkrmQbT0Qtig@mail.gmail.com> (raw)
In-Reply-To: <20180320041454.GA15213@sigill.intra.peff.net>
That's perfect, thank you so much!
On Tue, Mar 20, 2018 at 12:14 AM, Jeff King <peff@peff.net> wrote:
> On Tue, Mar 20, 2018 at 12:04:11AM -0400, Jeff King wrote:
>
>> > I guess my takeaway is that it would be _good_ if the gitattributes
>> > documentation contained the caveat about not matching directories
>> > recursively, but _great_ if gitattributes and gitignore (and whatever
>> > else there is) were consistent.
>>
>> I agree it would be nice if they were consistent (and pathspecs, too).
>> But unfortunately at this point there's a maze of backwards
>> compatibility to deal with.
>
> So let's not forget to do the easy half there. Here's a patch.
>
> -- >8 --
> Subject: [PATCH] doc/gitattributes: mention non-recursive behavior
>
> The gitattributes documentation claims that the pattern
> rules are largely the same as for gitignore. However, the
> rules for recursion are different.
>
> In an ideal world, we would make them the same (if for
> nothing else than consistency and simplicity), but that
> would create backwards compatibility issues. For some
> discussion, see this thread:
>
> https://public-inbox.org/git/slrnkldd3g.1l4.jan@majutsushi.net/
>
> But let's at least document the differences instead of
> actively misleading the user by claiming that they're the
> same.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Documentation/gitattributes.txt | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index d52b254a22..1094fe2b5b 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -56,9 +56,16 @@ Unspecified::
>
> When more than one pattern matches the path, a later line
> overrides an earlier line. This overriding is done per
> -attribute. The rules how the pattern matches paths are the
> -same as in `.gitignore` files; see linkgit:gitignore[5].
> -Unlike `.gitignore`, negative patterns are forbidden.
> +attribute.
> +
> +The rules by which the pattern matches paths are the same as in
> +`.gitignore` files (see linkgit:gitignore[5]), with a few exceptions:
> +
> + - negative patterns are forbidden
> +
> + - patterns that match a directory do not recursively match paths
> + inside that directory (so using the trailing-slash `path/` syntax is
> + pointless in an attributes file; use `path/**` instead)
>
> When deciding what attributes are assigned to a path, Git
> consults `$GIT_DIR/info/attributes` file (which has the highest
> --
> 2.17.0.rc0.402.ged0b3fd1ee
>
next prev parent reply other threads:[~2018-03-20 4:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 1:49 .gitattributes override behavior (possible bug, or documentation bug) Dakota Hawkins
2018-03-20 2:34 ` Jeff King
2018-03-20 3:10 ` Dakota Hawkins
2018-03-20 3:17 ` Dakota Hawkins
2018-03-20 4:12 ` Jeff King
2018-03-20 4:04 ` Jeff King
2018-03-20 4:14 ` [PATCH] doc/gitattributes: mention non-recursive behavior Jeff King
2018-03-20 4:28 ` Dakota Hawkins [this message]
2018-03-20 16:41 ` Duy Nguyen
2018-03-21 6:50 ` Jeff King
2018-03-21 16:16 ` Duy Nguyen
2018-03-23 9:12 ` Jeff King
2018-03-20 4:25 ` .gitattributes override behavior (possible bug, or documentation bug) Dakota Hawkins
2018-03-20 4:40 ` Jeff King
2018-03-20 4:49 ` Dakota Hawkins
2018-03-20 16:28 ` Duy Nguyen
2018-03-21 3:22 ` Dakota Hawkins
2018-03-21 6:52 ` Jeff King
2018-03-21 7:36 ` Dakota Hawkins
2018-03-21 7:44 ` Dakota Hawkins
2018-03-21 7:50 ` Jeff King
2018-03-21 8:35 ` Dakota Hawkins
2018-03-21 8:36 ` Jeff King
2018-03-21 16:18 ` Junio C Hamano
2018-03-21 16:07 ` Duy Nguyen
2018-03-20 3:33 ` Junio C Hamano
2018-03-20 3:40 ` Dakota Hawkins
2018-03-20 3:45 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHnyXxSOvU9aokdyo_UBcHPLeCSogyFCRjxXi9NkrmQbT0Qtig@mail.gmail.com \
--to=dakota@dakotahawkins.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).