summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-02 05:42:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-02 05:42:01 (GMT)
commit50cbebf78ddf4f7e79ffa74c51d6fb0f11c19a2e (patch)
tree0ef601dd139939e26d0225fda86cc25ba5744cfa
parentdd097fcd4d3d6692ec19c0caf4686aa8849301a2 (diff)
parent093b06889104d218e95251176af5cf4aa5dd5cdd (diff)
downloadgit-50cbebf78ddf4f7e79ffa74c51d6fb0f11c19a2e.zip
git-50cbebf78ddf4f7e79ffa74c51d6fb0f11c19a2e.tar.gz
git-50cbebf78ddf4f7e79ffa74c51d6fb0f11c19a2e.tar.bz2
Merge branch 'nh/fetch-http'
* nh/fetch-http: git-fetch: resolve remote symrefs for HTTP transport
-rwxr-xr-xgit-fetch.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index 83143f8..280f62e 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -270,14 +270,22 @@ fetch_main () {
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
- remote_name_quoted=$(perl -e '
+ max_depth=5
+ depth=0
+ head="ref: $remote_name"
+ while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null
+ do
+ remote_name_quoted=$(perl -e '
my $u = $ARGV[0];
+ $u =~ s/^ref:\s*//;
$u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
print "$u";
- ' "$remote_name")
- head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
+ ' "$head")
+ head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted")
+ depth=$( expr \( $depth + 1 \) )
+ done
expr "z$head" : "z$_x40\$" >/dev/null ||
- die "Failed to fetch $remote_name from $remote"
+ die "Failed to fetch $remote_name from $remote"
echo >&2 Fetching "$remote_name from $remote" using http
git-http-fetch -v -a "$head" "$remote/" || exit
;;