diff: Fix rename pretty-print when suffix and prefix overlap
commitd020e27fdaeb7d04247cdf5a0ff84d97626d5f5a
authorAntoine Pelisse <apelisse@gmail.com>
Sat, 23 Feb 2013 16:48:45 +0000 (23 17:48 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2013 07:52:39 +0000 (23 23:52 -0800)
tree9d6a52c0617701b333bad6c68303977c19cd78f7
parentf174a2583c9f42315b60205890fa67a79a1f1669
diff: Fix rename pretty-print when suffix and prefix overlap

When considering a rename for two files that have a suffix and a prefix
that can overlap, a confusing line is shown. As an example, renaming
"a/b/b/c" to "a/b/c" shows "a/b/{ => }/b/c".

Currently, what we do is calculate the common prefix ("a/b/"), and the
common suffix ("/b/c"), but the same "/b/" is actually counted both in
prefix and suffix. Then when calculating the size of the non-common part,
we end-up with a negative value which is reset to 0, thus the "{ => }".

Do not allow the common suffix to overlap the common prefix and stop
when reaching a "/" that would be in both.

Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c