Merge branch 'jk/maint-sha1-file-name-fix' into next
commitf7dd2637ef44c1e82b43a7610d89300c5b5e6acc
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jun 2010 22:18:10 +0000 (3 15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jun 2010 22:18:10 +0000 (3 15:18 -0700)
tree2315e4fcb6cacdb02724feb923fc87eec28156c8
parentfff7253f9085c4f580196fdf637e442f90996f9c
parent560fb6a183e1cdbc2948b06cc60bba07f79804a6
Merge branch 'jk/maint-sha1-file-name-fix' into next

* jk/maint-sha1-file-name-fix:
  remove over-eager caching in sha1_file_name
sha1_file.c