Merge branch 'maint'
commit695f9523ddfa0a2b8325507b4f077b073d8f438f
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Oct 2009 23:10:37 +0000 (14 16:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Oct 2009 23:10:37 +0000 (14 16:10 -0700)
tree007e445a49deb60ab1fbdb886a202590cd1837a1
parent18a536476e68349bacab7ddf84166a907dd0bede
parentb3118bdc91876cbc04b7e81dcf7bea71d86ce4f8
Merge branch 'maint'

* maint:
  sha1_file: Fix infinite loop when pack is corrupted