From: Junio C Hamano <junkio@cox.net>
Date: Tue, 18 Apr 2006 06:15:20 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~210
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5de825fda5795c2607ae870fcc4369db1ae77c2;p=git.git

Merge branch 'master' into next

* master:
  packed_object_info_detail(): check for corrupt packfile.
  cleanups: remove unused variable from exec_cmd.c
  cleanups: prevent leak of two strduped strings in config.c
  cleanups: Remove impossible case in quote.c
  cleanups: Remove unused vars from combine-diff.c
  cleanups: Fix potential bugs in connect.c
  Allow empty lines in info/grafts
---

e5de825fda5795c2607ae870fcc4369db1ae77c2