From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Aug 2009 02:34:16 +0000 (-0700)
Subject: Merge branch 'rc/maint-http-fix' into maint
X-Git-Tag: v1.6.4.2~2
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/48ae73b11487e12f8f7198e18779e65500d4ca0c?hp=4b9fa0e359a710b5d8dae542a92df7dbe56d9915

Merge branch 'rc/maint-http-fix' into maint

* rc/maint-http-fix:
http.c: don't assume that urls don't end with slash
---

diff --git a/http.c b/http.c
index 1ae19e070d..d60f7f7679 100644
--- a/http.c
+++ b/http.c
@@ -719,7 +719,9 @@ void append_remote_object_url(struct strbuf *buf, const char *url,
 			      const char *hex,
 			      int only_two_digit_prefix)
 {
-	strbuf_addf(buf, "%s/objects/%.*s/", url, 2, hex);
+	end_url_with_slash(buf, url);
+
+	strbuf_addf(buf, "objects/%.*s/", 2, hex);
 	if (!only_two_digit_prefix)
 		strbuf_addf(buf, "%s", hex+2);
 }