From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Aug 2010 19:53:09 +0000 (-0700)
Subject: Merge branch 'jc/maint-follow-rename-fix' into maint
X-Git-Tag: v1.7.2.3~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55c6e6dc38188d27b4ec0315db93d6c40725cdd6;p=git.git

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
---

55c6e6dc38188d27b4ec0315db93d6c40725cdd6