Merge branch 'jk/diffcore-rename-duplicate' into maint
commit3aab60b3baefd79d113fdc83685ba38c71986538
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:08 +0000 (13 22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:08 +0000 (13 22:56 -0700)
tree36e8e17ba930e1595fbcb2f6e812f3582a50d5d7
parentae8ada450a9103d2fe94ac9baf072fd31de08c30
parent4d6be03b95c3db21db1bb8fee01128c1b13f70e7
Merge branch 'jk/diffcore-rename-duplicate' into maint

A corrupt input to "git diff -M" can cause us to segfault.

* jk/diffcore-rename-duplicate:
  diffcore-rename: avoid processing duplicate destinations
  diffcore-rename: split locate_rename_dst into two functions
diffcore-rename.c