From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sun, 9 Sep 2012 06:19:38 +0000 (+0200)
Subject: Rename static function fetch_pack() to http_fetch_pack()
X-Git-Tag: v1.8.0-rc0~30^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07c19e72c5f07ac687e87e49cbb4e128a8b26629;p=git.git

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>
---

diff --git a/http-walker.c b/http-walker.c
index 51a906e9e..1516c5eb2 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;