Forward port the "funny ref avoidance" in clone and fetch from maint branch.
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 04:47:06 +0000 (21:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 04:47:06 +0000 (21:47 -0700)
Somehow I forgot to forward port these fixes.  "git clone" from a
repository prepared with the latest update-server-info would fail
without this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-clone.sh
git-fetch.sh

index 7143131..18e692a 100755 (executable)
@@ -53,7 +53,11 @@ Perhaps git-update-server-info needs to be run there?"
        while read sha1 refname
        do
                name=`expr "$refname" : 'refs/\(.*\)'` &&
-               git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+               case "$name" in
+               *^*)    ;;
+               *)
+                       git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+               esac
        done <"$clone_tmp/refs"
        rm -fr "$clone_tmp"
 }
index 0cb1596..31b1cf0 100755 (executable)
@@ -176,7 +176,7 @@ if test "$tags"
 then
        taglist=$(git-ls-remote --tags "$remote" |
                sed -e '
-                       /\^{}$/d
+                       /\^/d
                        s/^[^   ]*      //
                        s/.*/&:&/')
        if test "$#" -gt 1