From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Mar 2015 05:56:08 +0000 (-0700)
Subject: Merge branch 'jk/diffcore-rename-duplicate' into maint
X-Git-Tag: v2.3.3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3aab60b3baefd79d113fdc83685ba38c71986538?hp=--cc

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
---

3aab60b3baefd79d113fdc83685ba38c71986538