From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Mar 2015 20:52:38 +0000 (-0700)
Subject: Merge branch 'jk/diffcore-rename-duplicate'
X-Git-Tag: v2.4.0-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d659f7d6e6071701a4f532487edf139b3e1fa9d?ds=inline;hp=--cc

Merge branch 'jk/diffcore-rename-duplicate'

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

2d659f7d6e6071701a4f532487edf139b3e1fa9d