X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-push.sh;h=706db9933e7a3d418a0bc77a743695464901b800;hb=04fe2a1706b4bd71b604bfe7d7295064440872cf;hp=00d715059c4b751bef9adaf3debbe56ae1cf19ac;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git

diff --git a/git-push.sh b/git-push.sh
index 00d71505..706db993 100755
--- a/git-push.sh
+++ b/git-push.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
+
+USAGE='[--all] [--tags] [--force] <repository> [<refspec>...]'
+. git-sh-setup
 
 # Parse out parameters and then stop at remote, so that we can
 # translate it using .git/branches information
@@ -7,18 +9,21 @@ has_all=
 has_force=
 has_exec=
 remote=
+do_tags=
 
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
 	--all)
 		has_all=--all ;;
+	--tags)
+		do_tags=yes ;;
 	--force)
 		has_force=--force ;;
 	--exec=*)
 		has_exec="$1" ;;
 	-*)
-		die "Unknown parameter $1" ;;
+                usage ;;
         *)
 		set x "$@"
 		shift
@@ -28,20 +33,39 @@ do
 done
 case "$#" in
 0)
-	die "Where would you want to push today?" ;;
+	echo "Where would you want to push today?"
+        usage ;;
 esac
 
 . git-parse-remote
 remote=$(get_remote_url "$@")
+
 case "$has_all" in
---all) set x ;;
-'')    set x $(get_remote_refs_for_push "$@") ;;
+--all)
+	set x ;;
+'')
+	case "$do_tags,$#" in
+	yes,1)
+		set x $(cd "$GIT_DIR/refs" && find tags -type f -print) ;;
+	yes,*)
+		set x $(cd "$GIT_DIR/refs" && find tags -type f -print) \
+		    $(get_remote_refs_for_push "$@") ;;
+	,*)
+		set x $(get_remote_refs_for_push "$@") ;;
+	esac
 esac
-shift
+
+shift ;# away the initial 'x'
+
+# $# is now 0 if there was no explicit refspec on the command line
+# and there was no defalt refspec to push from remotes/ file.
+# we will let git-send-pack to do its "matching refs" thing.
 
 case "$remote" in
-http://* | https://* | git://* | rsync://* )
-	die "Cannot push to $remote" ;;
+git://*)
+	die "Cannot use READ-ONLY transport to push to $remote" ;;
+rsync://*)
+        die "Pushing with rsync transport is deprecated" ;;
 esac
 
 set x "$remote" "$@"; shift
@@ -49,4 +73,9 @@ test "$has_all" && set x "$has_all" "$@" && shift
 test "$has_force" && set x "$has_force" "$@" && shift
 test "$has_exec" && set x "$has_exec" "$@" && shift
 
-exec git-send-pack "$@"
+case "$remote" in
+http://* | https://*)
+	exec git-http-push "$@";;
+*)
+	exec git-send-pack "$@";;
+esac