Merge branch 'nd/maint-fix-replace'

* nd/maint-fix-replace:
  parse_object: pass on the original sha1, not the replaced one

diff --cc object.c
Simple merge

diff --cc t/t6050-replace.sh
Simple merge