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

* rc/maint-http-fix: http.c: don't assume that urls don't end with slash
git-mirror · Aug 29, 2009 · 48ae73b · 48ae73b
2 parents 4b9fa0e + 800324c
commit 48ae73b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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);
 }