Merge branch 'jc/maint-follow-rename-fix' into maint
commit55c6e6dc38188d27b4ec0315db93d6c40725cdd6
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:09 +0000 (20 12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:09 +0000 (20 12:53 -0700)
treeede040677f6ad505638458f178d9527600ee7b4e
parent16bfbe6352e90b87de26effe5ce120ab74ebafc7
parent65113121a50cd765033d51204213c817832c59cf
Merge branch 'jc/maint-follow-rename-fix' into maint

* 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