From: Junio C Hamano <gitster@pobox.com>
To: "Andrew Berry" <andrew@furrypaws.ca>
Cc: git@vger.kernel.org, bagasdotme@gmail.com
Subject: Re: [PATCH] docs: .gitignore parsing is to the top of the repo
Date: Tue, 06 Jul 2021 18:20:27 -0700 [thread overview]
Message-ID: <xmqqh7h6gbs4.fsf@gitster.g> (raw)
In-Reply-To: <CA0F1460-CB39-45DC-8DED-13F7ABA674D1@furrypaws.ca> (Andrew Berry's message of "Tue, 06 Jul 2021 20:32:52 -0400")
"Andrew Berry" <andrew@furrypaws.ca> writes:
>>> Line rewrapping makes it hard to see what actually got changed,
>
> To check, that's asked for, correct? Or is it better to do one commit
> with the word changes, another to clean up the wrapping?
We do not encourage one-word-per-line or other silliness, but as
long as the source is readable enough, there is no need for line
re-wrapping, and I suspect that principle would apply.
>> Another tangent. The discovery process used for the .gitattributes
>> files is identical to what is done to the .gitignore files; we may
>> want to make sure that the explanation we give in our documentation
>> won't cause the same confusion you are trying to avoid with this
>> change. Such a fix does not have to be (and probably should not be)
>> a part of this change, though.
>
> I'm out of the office for the next week, but otherwise I'm glad to
> take that on when I'm back if no one else picks it up.
Here is how we describe the .gitattributes side:
When deciding what attributes are assigned to a path, Git
consults `$GIT_DIR/info/attributes` file (which has the highest
precedence), `.gitattributes` file in the same directory as the
path in question, and its parent directories up to the toplevel of the
work tree (the further the directory that contains `.gitattributes`
is from the path in question, the lower its precedence). Finally
global and system-wide files are considered (they have the lowest
precedence).
I think we are already good on this side.
Thanks.
next prev parent reply other threads:[~2021-07-07 1:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 22:20 [PATCH] docs: .gitignore in parents is current repo only Andrew Berry
2021-07-03 0:06 ` Junio C Hamano
2021-07-03 0:21 ` Bagas Sanjaya
2021-07-05 17:30 ` Andrew Berry
2021-07-05 19:59 ` Junio C Hamano
2021-07-05 23:50 ` Andrew Berry
2021-07-06 16:18 ` Junio C Hamano
2021-07-06 20:54 ` [PATCH] docs: .gitignore parsing is to the top of the repo Andrew Berry
2021-07-06 20:57 ` Andrew Berry
2021-07-06 21:57 ` Junio C Hamano
2021-07-07 0:18 ` Junio C Hamano
2021-07-07 0:32 ` Andrew Berry
2021-07-07 1:20 ` Junio C Hamano [this message]
2021-07-18 14:12 ` Andrew Berry
2021-07-19 18:36 ` Junio C Hamano
2021-07-06 21:55 ` Junio C Hamano
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=xmqqh7h6gbs4.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andrew@furrypaws.ca \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
/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).