From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 21:00:37 +0000 (-0700)
Subject: Merge branch 'ap/maint-diff-rename-avoid-overlap'
X-Git-Tag: v1.8.3-rc0~184
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/caf217a3b8ed4b88f58e2a151c07221d37db7abe

Merge branch 'ap/maint-diff-rename-avoid-overlap'

The logic used by "git diff -M --stat" to shorten the names of
files before and after a rename did not work correctly when the
common prefix and suffix between the two filenames overlapped.

* ap/maint-diff-rename-avoid-overlap:
tests: make sure rename pretty print works
diff: prevent pprint_rename from underrunning input
diff: Fix rename pretty-print when suffix and prefix overlap
---

caf217a3b8ed4b88f58e2a151c07221d37db7abe