Merge branch 'maint-1.6.0' into maint
commit7a134dbbc9ca7013c09b610351c5ce45dc10cda5
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2009 02:32:37 +0000 (11 18:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2009 02:32:37 +0000 (11 18:32 -0800)
tree911f77ae0affc4845c8a3fe5dc346b9f764e1bbe
parent268c015495038be387ad3c5d674851889c497716
parent3e6b1d0abcd58f0b2b106212ce0a0e07a6de342f
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Make repack less likely to corrupt repository
  fast-export: ensure we traverse commits in topological order
  Clear the delta base cache if a pack is rebuilt
builtin-fast-export.c
sha1_file.c