diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:30:53 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:30:53 -0700 |
commit | 5b590d783a461c63fa803d1c21b57bc79c0207f7 (patch) | |
tree | 3ad36990856314a6956226c0daf182f6df6762d5 /http.c | |
parent | 0c3d3ac352427738e7c4393c0a959e0e698a0c7a (diff) | |
parent | 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4 (diff) | |
download | git-5b590d783a461c63fa803d1c21b57bc79c0207f7.tar.gz |
Merge branch 'maint'
* maint:
GIT 1.6.4.3
svn: properly escape arguments for authors-prog
http.c: remove verification of remote packs
grep: accept relative paths outside current working directory
grep: fix exit status if external_grep() punts
Conflicts:
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -869,17 +869,6 @@ static int fetch_pack_index(unsigned char *sha1, const char *base_url) char *url; struct strbuf buf = STRBUF_INIT; - /* Don't use the index if the pack isn't there */ - end_url_with_slash(&buf, base_url); - strbuf_addf(&buf, "objects/pack/pack-%s.pack", hex); - url = strbuf_detach(&buf, 0); - - if (http_get_strbuf(url, NULL, 0)) { - ret = error("Unable to verify pack %s is available", - hex); - goto cleanup; - } - if (has_pack_index(sha1)) { ret = 0; goto cleanup; |