Merge branch 'jc/reupdate' into next

* jc/reupdate:
  Fix users of prefix_path() to free() only when necessary

diff --cc checkout-index.c
Simple merge

diff --cc update-index.c
Simple merge