tree 36e8e17ba930e1595fbcb2f6e812f3582a50d5d7
parent ae8ada450a9103d2fe94ac9baf072fd31de08c30
parent 4d6be03b95c3db21db1bb8fee01128c1b13f70e7
author Junio C Hamano <gitster@pobox.com> 1426312568 -0700
committer Junio C Hamano <gitster@pobox.com> 1426312568 -0700

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