X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-clone.sh;h=0e8a57d2b499dd4f444ba8d93fb271ec88c222c7;hb=98a4fef3f28e48d12a4fecd5cf97daa774c1e5bc;hp=3b5475340d4c9687bd1ade4464689d23d6692f93;hpb=f1250edff5356cba7d8e71ec68418a4233b8bed0;p=git.git

diff --git a/git-clone.sh b/git-clone.sh
index 3b547534..0e8a57d2 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -9,7 +9,7 @@
 unset CDPATH
 
 usage() {
-	echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]"
+	echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
 	exit 1
 }
 
@@ -45,7 +45,7 @@ Perhaps git-update-server-info needs to be run there?"
 		if test -n "$use_separate_remote" &&
 		   branch_name=`expr "$name" : 'heads/\(.*\)'`
 		then
-			tname="remotes/$branch_name"
+			tname="remotes/$origin/$branch_name"
 		else
 			tname=$name
 		fi
@@ -121,14 +121,15 @@ while
 	*,-q|*,--quiet) quiet=-q ;;
 	*,--use-separate-remote)
 		use_separate_remote=t ;;
-	1,-o) usage;;
 	1,--reference) usage ;;
 	*,--reference)
 		shift; reference="$1" ;;
 	*,--reference=*)
 		reference=`expr "$1" : '--reference=\(.*\)'` ;;
-	*,-o)
+	*,-o|*,--or|*,--ori|*,--orig|*,--origi|*,--origin)
 		case "$2" in
+		'')
+		    usage ;;
 		*/*)
 		    echo >&2 "'$2' is not suitable for an origin name"
 		    exit 1
@@ -138,7 +139,7 @@ while
 		    exit 1
 		}
 		test -z "$origin_override" || {
-		    echo >&2 "Do not give more than one -o options."
+		    echo >&2 "Do not give more than one --origin options."
 		    exit 1
 		}
 		origin_override=yes
@@ -160,7 +161,7 @@ if test yes = "$bare"
 then
 	if test yes = "$origin_override"
 	then
-		echo >&2 '--bare and -o $origin options are incompatible.'
+		echo >&2 '--bare and --origin $origin options are incompatible.'
 		exit 1
 	fi
 	if test t = "$use_separate_remote"
@@ -370,16 +371,22 @@ then
 Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
 		case "$use_separate_remote" in
 		t) git-update-ref HEAD "$head_sha1" ;;
-		*) git-update-ref "refs/$origin" $(git-rev-parse HEAD)
+		*) git-update-ref "refs/heads/$origin" $(git-rev-parse HEAD) ;;
 		esac &&
 		(cd "$GIT_DIR/$remote_top" && find . -type f -print) |
 		while read dotslref
 		do
 			name=`expr "$dotslref" : './\(.*\)'` &&
 			test "$head_points_at" = "$name" ||
-			test "$origin" = "$head" ||
+			test "$origin" = "$name" ||
 			echo "Pull: refs/heads/${name}:$remote_top/${name}"
-		done >>"$GIT_DIR/remotes/$origin"
+		done >>"$GIT_DIR/remotes/$origin" &&
+		case "$use_separate_remote" in
+		t)
+			rm -f "refs/remotes/$origin/HEAD"
+			git-symbolic-ref "refs/remotes/$origin/HEAD" \
+				"refs/remotes/$origin/$head_points_at"
+		esac
 	esac
 
 	case "$no_checkout" in