Handle the rename cases reported by git-diff-tree -C correctly.