My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae8ada4 4d6be03)
Merge branch 'jk/diffcore-rename-duplicate' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:08 +0000 (22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:08 +0000 (22:56 -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
The core git plumbing