From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Karthik Nayak <karthik.188@gmail.com>,
Taylor Blau <me@ttaylorr.com>, Jeff King <peff@peff.net>,
John Cai <johncai86@gmail.com>,
Dhruva Krishnamurthy <dhruvakm@gmail.com>
Subject: [PATCH] attr.tree: HEAD:.gitattributes is no longer the default in a bare repo
Date: Wed, 05 Jun 2024 14:43:03 -0700 [thread overview]
Message-ID: <xmqqa5jzqd5k.fsf_-_@gitster.g> (raw)
In-Reply-To: <xmqqzft6aozg.fsf_-_@gitster.g> (Junio C. Hamano's message of "Fri, 03 May 2024 08:34:27 -0700")
51441e64 (stop using HEAD for attributes in bare repository by
default, 2024-05-03) has addressed a recent performance regression
by partially reverting a topic that was merged at 26dd307c (Merge
branch 'jc/attr-tree-config', 2023-10-30). But it forgot to update
the documentation to remove the mention of a special case in bare
repositories.
Let's update the document before the update hits the next release.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config/attr.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git c/Documentation/config/attr.txt w/Documentation/config/attr.txt
index 1a482d6af2..c4a5857993 100644
--- c/Documentation/config/attr.txt
+++ w/Documentation/config/attr.txt
@@ -1,7 +1,6 @@
attr.tree::
A reference to a tree in the repository from which to read attributes,
- instead of the `.gitattributes` file in the working tree. In a bare
- repository, this defaults to `HEAD:.gitattributes`. If the value does
- not resolve to a valid tree object, an empty tree is used instead.
+ instead of the `.gitattributes` file in the working tree. If the value
+ does not resolve to a valid tree object, an empty tree is used instead.
When the `GIT_ATTR_SOURCE` environment variable or `--attr-source`
command line option are used, this configuration variable has no effect.
next prev parent reply other threads:[~2024-06-05 21:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-01 5:26 Help troubleshoot performance regression cloning with depth: git 2.44 vs git 2.42 Dhruva Krishnamurthy
2024-05-01 22:00 ` using tree as attribute source is slow, was " Jeff King
2024-05-01 22:37 ` rsbecker
2024-05-01 22:40 ` Junio C Hamano
2024-05-02 0:33 ` Taylor Blau
2024-05-02 17:33 ` Taylor Blau
2024-05-02 17:44 ` Junio C Hamano
2024-05-02 17:55 ` Taylor Blau
2024-05-02 19:01 ` Karthik Nayak
2024-05-02 21:08 ` Junio C Hamano
2024-05-03 5:37 ` Dhruva Krishnamurthy
2024-05-03 15:34 ` Re* " Junio C Hamano
2024-05-03 17:46 ` Jeff King
2024-05-06 20:28 ` Taylor Blau
2024-05-13 20:16 ` John Cai
2024-06-05 21:43 ` Junio C Hamano [this message]
2024-06-06 8:32 ` [PATCH] attr.tree: HEAD:.gitattributes is no longer the default in a bare repo Jeff King
2024-06-06 16:02 ` Junio C Hamano
2024-05-02 18:34 ` using tree as attribute source is slow, was Re: Help troubleshoot performance regression cloning with depth: git 2.44 vs git 2.42 Dhruva Krishnamurthy
2024-05-02 0:45 ` Dhruva Krishnamurthy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa5jzqd5k.fsf_-_@gitster.g \
--to=gitster@pobox.com \
--cc=dhruvakm@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.com \
--cc=karthik.188@gmail.com \
--cc=me@ttaylorr.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.