[PATCH] git-fetch --tags: deal with tags with spaces in them.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] git-fetch --tags: deal with tags with spaces in them. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] git-fetch --tags: deal with tags with spaces in them. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] git-fetch --tags: deal with tags with spaces in them. · Petr Baudis <hidden>
- 2016-06-15 · Re: [PATCH] git-fetch --tags: deal with tags with spaces in them. · "H. Peter Anvin" <hpa@zytor.com>
- 2016-06-15 · Re: [PATCH] git-fetch --tags: deal with tags with spaces in them. · "H. Peter Anvin" <hpa@zytor.com>
"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/. Signed-off-by: Junio C Hamano <redacted> --- Junio C Hamano [off-list ref] writes: > But in general, we should avoid spaces in reference names. > Scripts have problem with them. For example, "git-fetch > --tags" currently cannot handle it. If people cared deeply > enough maybe they can rewrite parts of it in Perl and send me > a patch ;-). And as usual, I end up being "people", but I did not use Perl ;-). Only lightly tested but it should fetch tags from your repository. I did not want to keep slurping those 70MB and 16MB packs, so I cheated by creating a small repository with funky tag names locally while testing. git-fetch.sh | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) applies-to: 5db8c58bc7403c7b076dea420133e6e890835e1a c1a4b1dd71e23d877dfbf04a2ac8b1c238fc5eb4
diff --git a/git-fetch.sh b/git-fetch.sh
index d398866..b3f3782 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh@@ -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=
@@ -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
@@ -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
@@ -204,7 +211,7 @@ 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
@@ -212,11 +219,9 @@ do if [ -n "$GIT_SSL_NO_VERIFY" ]; then curl_extra_args="-k" fi - head=$(curl -nsf $curl_extra_args "$remote/$remote_name") && - expr "$head" : "$_x40\$" >/dev/null || - 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 + ref_name=`expr "$remote_name" : 'refs/\(.*\)'` + git-http-fetch -v -a "$ref_name" "$remote/" || exit ;; rsync://*) TMP_HEAD="$GIT_DIR/TMP_HEAD"
--- 0.99.8.GIT