Merge branch 'jc/no-default-attr-tree-in-bare'

Git 2.43 started using the tree of HEAD as the source of attributes
in a bare repository, which has severe performance implications.
For now, revert the change, without ripping out a more explicit
support for the attr.tree configuration variable.

* jc/no-default-attr-tree-in-bare:
  stop using HEAD for attributes in bare repository by default
This commit is contained in:
Junio C Hamano
2024-05-13 10:19:46 -07:00
3 changed files with 10 additions and 10 deletions

7
attr.c
View File

@ -1222,13 +1222,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;