Merge branch 'jc/maint-follow-rename-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:09 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:09 +0000 (12:53 -0700)
* jc/maint-follow-rename-fix:
log: test for regression introduced in v1.7.2-rc0~103^2~2
diff --follow: do call diffcore_std() as necessary
diff --follow: do not waste cycles while recursing

Trivial merge