Merge branch 'maint'

* maint:
grep: fix word-regexp colouring
completion: use git rev-parse to detect bare repos
Cope better with a _lot_ of packs
for-each-ref: fix segfault in copy_email

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc sha1_file.c
Simple merge