Merge branch 'jc/no-default-attr-tree-in-bare' into ps/undecided-is-not-necessarily...

* jc/no-default-attr-tree-in-bare:
  stop using HEAD for attributes in bare repository by default

diff --cc attr.c
Simple merge

diff --cc t/t0003-attributes.sh
Simple merge