Skip to content

Commit

Permalink
git-fetch --tags: deal with tags with spaces in them.
Browse files Browse the repository at this point in the history
"git-fetch --tags" can get confused with tags with spaces in their names,
it used to use shell IFS to split the list of tags and also used curl
which insists the URL to be escaped.  Fix it so it can work with Martin's
moodle repository http://locke.catalyst.net.nz/git/moodle.git/.

We still reserve characters like leading plus-sign '+' and colon
':' anywhere to represent refspec src-dst pair, and obviously we
cannot use LF (that terminates Pull: line in .git/remotes
files), but now you can have spaces with this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Oct 12, 2005
1 parent 94fa447 commit 221e743
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"

LF='
'
IFS="$LF"

tags=
append=
force=
Expand Down Expand Up @@ -170,11 +174,14 @@ esac
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
taglist=$(git-ls-remote --tags "$remote" | awk '{ print "."$2":"$2 }')
taglist=$(git-ls-remote --tags "$remote" |
sed -e '
s/^[^ ]* //
s/.*/&:&/')
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.
reflist="$reflist $taglist"
reflist="$reflist$LF$taglist"
else
# No explicit refspecs; fetch tags only.
reflist=$taglist
Expand All @@ -183,7 +190,7 @@ fi

for ref in $reflist
do
refs="$refs $ref"
refs="$refs$LF$ref"

# These are relative path from $GIT_DIR, typically starting at refs/
# but may be HEAD
Expand All @@ -204,15 +211,20 @@ do
remote_name=$(expr "$ref" : '\([^:]*\):')
local_name=$(expr "$ref" : '[^:]*:\(.*\)')

rref="$rref $remote_name"
rref="$rref$LF$remote_name"

# There are transports that can fetch only one head at a time...
case "$remote" in
http://* | https://*)
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
head=$(curl -nsf $curl_extra_args "$remote/$remote_name") &&
remote_name_quoted=$(perl -e '
my $u = $ARGV[0];
$u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
print "$u";
' "$remote_name")
head=$(curl -nsf $curl_extra_args "$remote/$remote_name_quoted") &&
expr "$head" : "$_x40\$" >/dev/null ||
die "Failed to fetch $remote_name from $remote"
echo >&2 Fetching "$remote_name from $remote" using http
Expand Down Expand Up @@ -262,6 +274,7 @@ case "$remote" in
http://* | https://* | rsync://* )
;; # we are already done.
*)
IFS=" $LF"
(
git-fetch-pack "$remote" $rref || echo failed "$remote"
) |
Expand Down

0 comments on commit 221e743

Please sign in to comment.