Merge branch 'maint'

* maint:
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return

diff --cc refs.c
Simple merge

diff --cc unpack-trees.c
Simple merge