Merge branch 'maint'
commitfd8475d9fb76fbc435ba5dc5b7e97b0cad92661d
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2009 05:30:45 +0000 (10 21:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2009 05:30:45 +0000 (10 21:30 -0800)
treee60ed01c440abe4ebfe125100bf4c44de1a49b2f
parentf6b98e46bdf64454d7c6ab76d617237118799d7b
parent9b27ea95189b1f276c9f7e10df81fa1476a4ad4d
Merge branch 'maint'

* maint:
  Clear the delta base cache during fast-import checkpoint
cache.h
fast-import.c
sha1_file.c