From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Feb 2008 18:01:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~157
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c;p=git.git

Merge branch 'maint'

* maint:
  Protect peel_ref fallback case from NULL parse_object result
  Ensure 'make dist' compiles git-archive.exe on Cygwin
---

dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c