Merge fixes up to GIT 1.0.4

diff --git a/git-push.sh b/git-push.sh
index 5aa6531945c9e3494e34abb08d81e9ad03864521..1c5cf80f8786eb20c6092a8fbce48e1f1c1cb9e1 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
-
-usage () {
-    die "Usage: git push [--all] [--force] <repository> [<refspec>]"
-}
 
+USAGE='[--all] [--force] <repository> [<refspec>...]'
+. git-sh-setup
 
 # Parse out parameters and then stop at remote, so that we can
 # translate it using .git/branches information
@@ -46,7 +43,7 @@ esac
 shift
 
 case "$remote" in
-http://* | https://* | git://*)
+git://*)
        die "Cannot use READ-ONLY transport to push to $remote" ;;
 rsync://*)
         die "Pushing with rsync transport is deprecated" ;;
@@ -57,4 +54,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