From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Jan 2010 04:08:31 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d0d706e5fd08b751a19562974ae0b76d9db03a1;p=git.git

Merge branch 'maint'

* maint:
  merge-recursive: do not return NULL only to cause segfault
  retry request without query when info/refs?query fails
---

2d0d706e5fd08b751a19562974ae0b76d9db03a1