summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2012-09-09 06:19:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-12 18:46:31 (GMT)
commit07c19e72c5f07ac687e87e49cbb4e128a8b26629 (patch)
treeb203014d04ee97ddffd3ac54b326c080e8891136
parent8db43d2935811319a1d427be4da2723f68516e62 (diff)
downloadgit-07c19e72c5f07ac687e87e49cbb4e128a8b26629.zip
git-07c19e72c5f07ac687e87e49cbb4e128a8b26629.tar.gz
git-07c19e72c5f07ac687e87e49cbb4e128a8b26629.tar.bz2
Rename static function fetch_pack() to http_fetch_pack()
Avoid confusion with the non-static function of the same name from fetch-pack.h. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--http-walker.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http-walker.c b/http-walker.c
index 51a906e..1516c5e 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -396,7 +396,7 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
return ret;
}
-static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
+static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
{
struct packed_git *target;
int ret;
@@ -524,7 +524,7 @@ static int fetch(struct walker *walker, unsigned char *sha1)
if (!fetch_object(walker, altbase, sha1))
return 0;
while (altbase) {
- if (!fetch_pack(walker, altbase, sha1))
+ if (!http_fetch_pack(walker, altbase, sha1))
return 0;
fetch_alternates(walker, data->alt->base);
altbase = altbase->next;