Merge branch 'rj/path-cleanup'

* rj/path-cleanup:
Call mkpathdup() rather than xstrdup(mkpath(...))
Call git_pathdup() rather than xstrdup(git_path("..."))
path.c: Use vsnpath() in the implementation of git_path()
path.c: Don't discard the return value of vsnpath()
path.c: Remove the 'git_' prefix from a file scope function

diff --cc builtin/add.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/prune.c
Simple merge

diff --cc merge-recursive.c
Simple merge