summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-08 05:55:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 06:38:51 (GMT)
commit46b1c7c03c3ae3bf17aa87bf9ae2f9fb38d08789 (patch)
treee0d408444aa1d3bc83d93d0c1e3b8ce31a50df6e
parent972b6fe746f0d9a3ea13118d80d9371a9ff68dba (diff)
downloadgit-46b1c7c03c3ae3bf17aa87bf9ae2f9fb38d08789.zip
git-46b1c7c03c3ae3bf17aa87bf9ae2f9fb38d08789.tar.gz
git-46b1c7c03c3ae3bf17aa87bf9ae2f9fb38d08789.tar.bz2
Teach git push .git/branches shorthand
Although it is uncertain if we would keep .git/branches for long, the shorthand stored there can be used for pushing if it is host:path/to/git format, so let's make use of it. This does not use git-parse-remote because that script will be rewritten quite a bit for updated pulling. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-push-script63
1 files changed, 62 insertions, 1 deletions
diff --git a/git-push-script b/git-push-script
index 80e922b..70fa968 100755
--- a/git-push-script
+++ b/git-push-script
@@ -1,3 +1,64 @@
#!/bin/sh
. git-sh-setup-script || die "Not a git archive"
-git-send-pack "$@"
+
+# Parse out parameters and then stop at remote, so that we can
+# translate it using .git/branches information
+has_all=
+has_force=
+has_exec=
+remote=
+
+while case "$#" in 0) break ;; esac
+do
+ case "$1" in
+ --all)
+ has_all=--all ;;
+ --force)
+ has_force=--force ;;
+ --exec=*)
+ has_exec="$1" ;;
+ -*)
+ die "Unknown parameter $1" ;;
+ *)
+ remote="$1"
+ shift
+ set x "$@"
+ shift
+ break ;;
+ esac
+ shift
+done
+
+case "$remote" in
+*:* | /* | ../* | ./* )
+ # An URL, host:/path/to/git, absolute and relative paths.
+ ;;
+* )
+ # Shorthand
+ if expr "$remote" : '..*/..*' >/dev/null
+ then
+ # a short-hand followed by a trailing path
+ shorthand=$(expr "$remote" : '\([^/]*\)')
+ remainder=$(expr "$remote" : '[^/]*\(/.*\)$')
+ else
+ shorthand="$remote"
+ remainder=
+ fi
+ remote=$(sed -e 's/#.*//' "$GIT_DIR/branches/$remote") &&
+ expr "$remote" : '..*:' >/dev/null &&
+ remote="$remote$remainder" ||
+ die "Cannot parse remote $remote"
+ ;;
+esac
+
+case "$remote" in
+http://* | https://* | git://* | rsync://* )
+ die "Cannot push to $remote" ;;
+esac
+
+set x "$remote" "$@"; shift
+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 "$@"