Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

diff --cc builtin-rev-parse.c
Simple merge