Merge branch 'cb/log-follow-with-combined' into maint
commit318e758f327c486a606ece48c5dfb5fa6e5d39d5
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:59 +0000 (3 15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:59 +0000 (3 15:30 -0700)
tree5f127b8b570a11cf61311f99b24769a21c3b7ef5
parentb3bf469bf8d4cff6fbfef7db1c6f74b63906a317
parent46ec510ac088ac2669e617a4c8c35e6218dabecc
Merge branch 'cb/log-follow-with-combined' into maint

"git log -c --follow $path" segfaulted upon hitting the commit that
renamed the $path being followed.

* cb/log-follow-with-combined:
  fix segfault with git log -c --follow
combine-diff.c
t/t4202-log.sh