| commit | c3276cfc72311663e6f38f7c3171dda6e2ed62e4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:14 +0000 (19 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:14 +0000 (19 15:57 -0700) | ||
| tree | 93e6051b12a1ebe59d966e1e9c1e2bc3196cdd37 | treesnapshot (tar.gz zip) |
| parent | d8367c53f95e3dc713ef20afd4bfd5298af7d08b | commitdiff |
| parent | b174eb42d08eeb32ae7341ff46b05c20d38abc2b | commitdiff |
Merge branch 'ap/maint-diff-rename-avoid-overlap' into next
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 |