| commit | caf217a3b8ed4b88f58e2a151c07221d37db7abe | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2013 21:00:37 +0000 (25 14:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2013 21:00:37 +0000 (25 14:00 -0700) | ||
| tree | 79b3ae9735eaef05809f2b9310683095f9280d0d | treesnapshot (tar.gz zip) |
| parent | b03b41e24c84731742e132d86ef3e449dcd6ec25 | commitdiff |
| parent | b174eb42d08eeb32ae7341ff46b05c20d38abc2b | commitdiff |
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
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
| diff.c | diff1 | diff2 | blobhistory |