Merge branch 'jc/maint-follow-rename-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:18 +0000 (12:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:18 +0000 (12:47 -0700)
commitbd3a97a27a97485b130802d497214be312b737f9
tree803a7822503dc81a00e54724f3dbe9f5963dec13
parent6b5005c88b3a0c360249deb8ca8b92201abaa824
parent65113121a50cd765033d51204213c817832c59cf
Merge branch 'jc/maint-follow-rename-fix'

* 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
diff.c
diff.h