diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-06 22:50:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-06 22:50:24 -0700 |
| commit | e9e8dd8801360e503db89be9372dc7ab719c4218 (patch) | |
| tree | 67c2b98e7aa235d163954de7d04defd33777a9f1 /attr.c | |
| parent | d4cc1ec35f3bcce816b69986ca41943f6ce21377 (diff) | |
| parent | 51441e6460b505c07b4a8a6deeaa7de4bf6e8e33 (diff) | |
| download | git-e9e8dd8801360e503db89be9372dc7ab719c4218.tar.gz | |
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
Diffstat (limited to 'attr.c')
| -rw-r--r-- | attr.c | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -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; |