From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 May 2006 20:54:42 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~160
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=016cd9f6654248ebfc25f3c0d3b0e6ee6f2c81f0;p=git.git

Merge branch 'fix'

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

016cd9f6654248ebfc25f3c0d3b0e6ee6f2c81f0