Forward port the "funny ref avoidance" in clone and fetch from maint branch.

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>

diff --git a/git-clone.sh b/git-clone.sh
index 71431319c008fbc5771d97c4229e7054efd76395..18e692a67b1515c57a20c8574ed53836fb53f2bd 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -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"
 }

diff --git a/git-fetch.sh b/git-fetch.sh
index 0cb1596f50c998ba1f4ac0e2049e1c18459fc5a8..31b1cf0306c238dad7fb5b808a7925776ac4d762 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -176,7 +176,7 @@ if test "$tags"
 then
        taglist=$(git-ls-remote --tags "$remote" |
                sed -e '
-                       /\^{}$/d
+                       /\^/d
                        s/^[^   ]*      //
                        s/.*/&:&/')
        if test "$#" -gt 1