X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-clone.sh;h=bfc6c2d79ff3d6c50fd397c36ee04693695ad814;hb=5f94c730f31862c7f500173ee3a9d141c4730f0b;hp=699205eb6644aeb8668aa56abddf4f00d9af2642;hpb=423325a2d24638ddcc82ce47be5e40be550f4507;p=git.git

diff --git a/git-clone.sh b/git-clone.sh
index 699205eb..bfc6c2d7 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -9,7 +9,7 @@
 unset CDPATH
 
 usage() {
-	echo >&2 "* git clone [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
+	echo >&2 "Usage: $0 [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]"
 	exit 1
 }
 
@@ -67,6 +67,7 @@ use_local=no
 local_shared=no
 no_checkout=
 upload_pack=
+origin=origin
 while
 	case "$#,$1" in
 	0,*) break ;;
@@ -75,6 +76,14 @@ while
         *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared) 
           local_shared=yes; use_local=yes ;;
 	*,-q|*,--quiet) quiet=-q ;;
+	1,-o) usage;;
+	*,-o)
+		git-check-ref-format "$2" || {
+		    echo >&2 "'$2' is not suitable for a branch name"
+		    exit 1
+		}
+		origin="$2"; shift
+		;;
 	1,-u|1,--upload-pack) usage ;;
 	*,-u|*,--upload-pack)
 		shift
@@ -188,7 +197,10 @@ yes,yes)
 		cd "$D" && case "$upload_pack" in
 		'') git-clone-pack $quiet "$repo" ;;
 		*) git-clone-pack $quiet "$upload_pack" "$repo" ;;
-		esac
+		esac || {
+			echo >&2 "clone-pack from '$repo' failed."
+			exit 1
+		}
 		;;
 	esac
 	;;
@@ -205,14 +217,14 @@ then
 		mkdir -p .git/remotes &&
 		echo >.git/remotes/origin \
 		"URL: $repo
-Pull: $head_points_at:origin" &&
-		cp ".git/refs/heads/$head_points_at" .git/refs/heads/origin &&
+Pull: $head_points_at:$origin" &&
+		git-update-ref "refs/heads/$origin" $(git-rev-parse HEAD) &&
 		find .git/refs/heads -type f -print |
 		while read ref
 		do
 			head=`expr "$ref" : '.git/refs/heads/\(.*\)'` &&
 			test "$head_points_at" = "$head" ||
-			test "origin" = "$head" ||
+			test "$origin" = "$head" ||
 			echo "Pull: ${head}:${head}"
 		done >>.git/remotes/origin
 	esac