Merge branch 'fix'
commit016cd9f6654248ebfc25f3c0d3b0e6ee6f2c81f0
authorJunio C Hamano <junkio@cox.net>
Tue, 9 May 2006 20:54:42 +0000 (9 13:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 May 2006 20:54:42 +0000 (9 13:54 -0700)
tree59ea0858fbdb88a97a466e6c3468038796ad252c
parent45f75a0167b4a4693f2c6005bf7db231ca91ecc8
parent28cc4ab4224164971a523e8a6c222b5ab2bae27d
Merge branch 'fix'

* fix:
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index