From cdb3950801fec8e9efa1607093a6e51737bacba0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 17 Oct 2005 21:47:06 -0700 Subject: [PATCH] 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 --- git-clone.sh | 6 +++++- git-fetch.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/git-clone.sh b/git-clone.sh index 71431319c0..18e692a67b 100755 --- 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 0cb1596f50..31b1cf0306 100755 --- 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