From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Jul 2009 23:57:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc2~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58b1ef2f0fce75ebf4fbf88e5bdf76a0afaeacce;p=git.git

Merge branch 'maint'

* maint:
  checkout -f: deal with a D/F conflict entry correctly
  sha1_name.c: avoid unnecessary strbuf_release
  refs.c: release file descriptor on error return
---

58b1ef2f0fce75ebf4fbf88e5bdf76a0afaeacce