Andrew's git / gitweb.git / diff
?
Merge branch 'jk/diffcore-rename-duplicate'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2015 20:52:38 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2015 20:52:39 +0000 (13:52 -0700)
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

1  2 
diffcore-rename.c patch | diff1 | diff2 | blob | history
diff --cc diffcore-rename.c
Simple merge