undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http.c: don't assume that urls don't end with slash

Browse Source 
Make append_remote_object_url() (and by implication,
get_remote_object_url) use end_url_with_slash() to ensure that the url
ends with a slash.

Previously, they assumed that the url did not end with a slash and
as a result appended a slash, sometimes errorneously.

This fixes an issue introduced in 5424bc5 ("http*: add helper methods
for fetching objects (loose)"), where the append_remote_object_url()
implementation in http-push.c, which assumed that urls end with a
slash, was replaced by another one in http.c, which assumed urls did
not end with a slash.

The above issue was raised by Thomas Schlichter:

  http://marc.info/?l=git&m=125043105231327

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Tested-by: Thomas Schlichter <thomas.schlichter@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2009-08-17 17:09:43 +08:00 committed by Junio C Hamano
parent 13354f5377
commit 800324c3ad
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
http.c
View File

@ -719,7 +719,9 @@ void append_remote_object_url(struct strbuf *buf, const char *url,
const char *hex, const char *hex,
int only_two_digit_prefix) 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) if (!only_two_digit_prefix)
strbuf_addf(buf, "%s", hex+2); strbuf_addf(buf, "%s", hex+2);
} }