| commit | 2d0d706e5fd08b751a19562974ae0b76d9db03a1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (21 20:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (21 20:08 -0800) | ||
| tree | 8852a1b2770efa8c69dfe85b6d7ece3d8621d53b | treesnapshot (tar.gz zip) |
| parent | b28a1ce04cdafbd3b470ec43c0f562054bd45d4d | commitdiff |
| parent | 19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb | commitdiff |
Merge branch 'maint'
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
| merge-recursive.c | diff1 | diff2 | blobhistory |
| remote-curl.c | diff1 | diff2 | blobhistory |