daemon: further tweaks.

diff --git a/git-push.sh b/git-push.sh
index a67f47df8ea4cdd3c916afdea6791f7e64571e7c..edc0b8317a6d566895c4a2df6a3f7d86773ca138 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 . git-sh-setup || die "Not a git archive"
 
+usage () {
+    die "Usage: git push [--all] [--force] <repository> [<refspec>]"
+}
+
+
 # Parse out parameters and then stop at remote, so that we can
 # translate it using .git/branches information
 has_all=
@@ -18,7 +23,7 @@ do
        --exec=*)
                has_exec="$1" ;;
        -*)
-               die "Unknown parameter $1" ;;
+                usage ;;
         *)
                set x "$@"
                shift
@@ -41,8 +46,10 @@ esac
 shift
 
 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
@@ -50,4 +57,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