Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700)
commit1da07343ae553af07eac09cc741ca91b6615023c
treecfbde1830507f498fd1dabe222a65d684ab78b56
parent0fa5cb0d1e13bf757b41b0b0665305b7c819ee60
parent86f7780c0b77b3c162f85d499189f9d1f0b296df
Merge branch 'master' into next

* master:
  sha1_file: avoid re-preparing duplicate packs
  handle concurrent pruning of packed objects