Merge branch 'maint-1.6.4' into maint-1.6.5

* maint-1.6.4:
Check size of path buffer before writing into it
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

diff --cc setup.c
Simple merge