stop using HEAD for attributes in bare repository by default

With 23865355 (attr: read attributes from HEAD when bare repo,
2023-10-13), we started to use the HEAD tree as the default
attribute source in a bare repository.  One argument for such a
behaviour is that it would make things like "git archive" run in
bare and non-bare repositories for the same commit consistent.
This changes was merged to Git 2.43 but without an explicit mention
in its release notes.

It turns out that this change destroys performance of shallowly
cloning from a bare repository.  As the "server" installations are
expected to be mostly bare, and "git pack-objects", which is the
core of driving the other side of "git clone" and "git fetch" wants
to see if a path is set not to delta with blobs from other paths via
the attribute system, the change forces the server side to traverse
the tree of the HEAD commit needlessly to find if each and every
paths the objects it sends out has the attribute that controls the
deltification.  Given that (1) most projects do not configure such
an attribute, and (2) it is dubious for the server side to honor
such an end-user supplied attribute anyway, this was a poor choice
of the default.

To mitigate the current situation, let's revert the change that uses
the tree of HEAD in a bare repository by default as the attribute
source.  This will help most people who have been happy with the
behaviour of Git 2.42 and before.

Two things to note:

 * If you are stuck with versions of Git 2.43 or newer, that is
   older than the release this fix appears in, you can explicitly
   set the attr.tree configuration variable to point at an empty
   tree object, i.e.

	$ git config attr.tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904

 * If you like the behaviour we are reverting, you can explicitly
   set the attr.tree configuration variable to HEAD, i.e.

	$ git config attr.tree HEAD

The right fix for this is to optimize the code paths that allow
accesses to attributes in tree objects, but that is a much more
involved change and is left as a longer-term project, outside the
scope of this "first step" fix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/attr.c b/attr.c
index e62876dfd3e9beae50d18da63f15285d5974b8ec..02ab8436266289d45d58467bbb82d451b2841c45 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -1213,13 +1213,6 @@ static void compute_default_attr_source(struct object_id *attr_source)
                ignore_bad_attr_tree = 1;
        }
 
-       if (!default_attr_source_tree_object_name &&
-           startup_info->have_repository &&
-           is_bare_repository()) {
-               default_attr_source_tree_object_name = "HEAD";
-               ignore_bad_attr_tree = 1;
-       }
-
        if (!default_attr_source_tree_object_name || !is_null_oid(attr_source))
                return;
 

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index aee2298f01331acdf3d73c1657f1a29ed1c8616b..5de46ddf67f7ffd309c595ee55000b4f5c241f21 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -384,13 +384,19 @@ test_expect_success 'bad attr source defaults to reading .gitattributes file' '
        )
 '
 
-test_expect_success 'bare repo defaults to reading .gitattributes from HEAD' '
+test_expect_success 'bare repo no longer defaults to reading .gitattributes from HEAD' '
        test_when_finished rm -rf test bare_with_gitattribute &&
        git init test &&
        test_commit -C test gitattributes .gitattributes "f/path test=val" &&
        git clone --bare test bare_with_gitattribute &&
-       echo "f/path: test: val" >expect &&
+
+       echo "f/path: test: unspecified" >expect &&
        git -C bare_with_gitattribute check-attr test -- f/path >actual &&
+       test_cmp expect actual &&
+
+       echo "f/path: test: val" >expect &&
+       git -C bare_with_gitattribute -c attr.tree=HEAD \
+               check-attr test -- f/path >actual &&
        test_cmp expect actual
 '
 

diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index eaf959d8f63f158651609a7c5b0c2eb6592b4926..7310774af5efeada84891df9c25d7363b3d15ab4 100755 (executable)
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -133,7 +133,8 @@ test_expect_success 'git archive vs. bare' '
 '
 
 test_expect_success 'git archive with worktree attributes, bare' '
-       (cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar &&
+       (cd bare &&
+       git -c attr.tree=HEAD archive --worktree-attributes HEAD) >bare-worktree.tar &&
        (mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar
 '