Skip to content

Commit 51441e6

Browse files
committed
stop using HEAD for attributes in bare repository by default
With 2386535 (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 4b825dc * 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 <[email protected]>
1 parent 0d464a4 commit 51441e6

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

attr.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,13 +1213,6 @@ static void compute_default_attr_source(struct object_id *attr_source)
12131213
ignore_bad_attr_tree = 1;
12141214
}
12151215

1216-
if (!default_attr_source_tree_object_name &&
1217-
startup_info->have_repository &&
1218-
is_bare_repository()) {
1219-
default_attr_source_tree_object_name = "HEAD";
1220-
ignore_bad_attr_tree = 1;
1221-
}
1222-
12231216
if (!default_attr_source_tree_object_name || !is_null_oid(attr_source))
12241217
return;
12251218

t/t0003-attributes.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,19 @@ test_expect_success 'bad attr source defaults to reading .gitattributes file' '
384384
)
385385
'
386386

387-
test_expect_success 'bare repo defaults to reading .gitattributes from HEAD' '
387+
test_expect_success 'bare repo no longer defaults to reading .gitattributes from HEAD' '
388388
test_when_finished rm -rf test bare_with_gitattribute &&
389389
git init test &&
390390
test_commit -C test gitattributes .gitattributes "f/path test=val" &&
391391
git clone --bare test bare_with_gitattribute &&
392-
echo "f/path: test: val" >expect &&
392+
393+
echo "f/path: test: unspecified" >expect &&
393394
git -C bare_with_gitattribute check-attr test -- f/path >actual &&
395+
test_cmp expect actual &&
396+
397+
echo "f/path: test: val" >expect &&
398+
git -C bare_with_gitattribute -c attr.tree=HEAD \
399+
check-attr test -- f/path >actual &&
394400
test_cmp expect actual
395401
'
396402

t/t5001-archive-attr.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ test_expect_success 'git archive vs. bare' '
133133
'
134134

135135
test_expect_success 'git archive with worktree attributes, bare' '
136-
(cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar &&
136+
(cd bare &&
137+
git -c attr.tree=HEAD archive --worktree-attributes HEAD) >bare-worktree.tar &&
137138
(mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar
138139
'
139140

0 commit comments

Comments
 (0)