diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 20:08:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 20:08:31 -0800 |
| commit | 2d0d706e5fd08b751a19562974ae0b76d9db03a1 (patch) | |
| tree | 8852a1b2770efa8c69dfe85b6d7ece3d8621d53b | |
| parent | b28a1ce04cdafbd3b470ec43c0f562054bd45d4d (diff) | |
| parent | 19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb (diff) | |
| download | git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.gz git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.xz | |
Merge branch 'maint'
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
| -rw-r--r-- | merge-recursive.c | 8 | ||||
| -rw-r--r-- | remote-curl.c | 18 |
2 files changed, 20 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1239647fc..cb53b01c1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -202,14 +202,14 @@ struct tree *write_tree_from_memory(struct merge_options *o) if (unmerged_cache()) { int i; - output(o, 0, "There are unmerged index entries:"); + fprintf(stderr, "BUG: There are unmerged index entries:\n"); for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; if (ce_stage(ce)) - output(o, 0, "%d %.*s", ce_stage(ce), - (int)ce_namelen(ce), ce->name); + fprintf(stderr, "BUG: %d %.*s", ce_stage(ce), + (int)ce_namelen(ce), ce->name); } - return NULL; + die("Bug in merge-recursive.c"); } if (!active_cache_tree) diff --git a/remote-curl.c b/remote-curl.c index 136100695..a904164e4 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -102,7 +102,7 @@ static struct discovery* discover_refs(const char *service) struct strbuf buffer = STRBUF_INIT; struct discovery *last = last_discovery; char *refs_url; - int http_ret, is_http = 0; + int http_ret, is_http = 0, proto_git_candidate = 1; if (last && !strcmp(service, last->service)) return last; @@ -121,6 +121,19 @@ static struct discovery* discover_refs(const char *service) init_walker(); http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); + + /* try again with "plain" url (no ? or & appended) */ + if (http_ret != HTTP_OK) { + free(refs_url); + strbuf_reset(&buffer); + + proto_git_candidate = 0; + strbuf_addf(&buffer, "%s/info/refs", url); + refs_url = strbuf_detach(&buffer, NULL); + + http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); + } + switch (http_ret) { case HTTP_OK: break; @@ -137,7 +150,8 @@ static struct discovery* discover_refs(const char *service) last->buf_alloc = strbuf_detach(&buffer, &last->len); last->buf = last->buf_alloc; - if (is_http && 5 <= last->len && last->buf[4] == '#') { + if (is_http && proto_git_candidate + && 5 <= last->len && last->buf[4] == '#') { /* smart HTTP response; validate that the service * pkt-line matches our request. */ |