]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d67f9d5 4d6be03)
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)
commit2d659f7d6e6071701a4f532487edf139b3e1fa9d
treea14ae14078861d0e0134f08781e41acd19e97c30tree | snapshot
parentd67f9d5e8fd2c165304153a87fd96054d2b74981commit | diff
parent4d6be03b95c3db21db1bb8fee01128c1b13f70e7commit | diff
Merge branch 'jk/diffcore-rename-duplicate'

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
diffcore-rename.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.