Merge branch 'jc/no-default-attr-tree-in-bare' into ps/undecided-is-not-necessarily-sha1
* jc/no-default-attr-tree-in-bare: stop using HEAD for attributes in bare repository by default
This commit is contained in:
7
attr.c
7
attr.c
@ -1223,13 +1223,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;
|
||||
|
||||
|
Reference in New Issue
Block a user