projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: minor cleanups, extra error-checking
[git.git]
/
git-push.sh
diff --git
a/git-push.sh
b/git-push.sh
index
136093b
..
f10cadb
100755
(executable)
--- a/
git-push.sh
+++ b/
git-push.sh
@@
-1,6
+1,6
@@
#!/bin/sh
#!/bin/sh
-USAGE='[--all] [--force] <repository> [<refspec>...]'
+USAGE='[--all] [--
tags] [--
force] <repository> [<refspec>...]'
. git-sh-setup
# Parse out parameters and then stop at remote, so that we can
. git-sh-setup
# Parse out parameters and then stop at remote, so that we can
@@
-8,6
+8,7
@@
USAGE='[--all] [--force] <repository> [<refspec>...]'
has_all=
has_force=
has_exec=
has_all=
has_force=
has_exec=
+has_thin=--thin
remote=
do_tags=
remote=
do_tags=
@@
-22,6
+23,10
@@
do
has_force=--force ;;
--exec=*)
has_exec="$1" ;;
has_force=--force ;;
--exec=*)
has_exec="$1" ;;
+ --thin)
+ ;; # noop
+ --no-thin)
+ has_thin= ;;
-*)
usage ;;
*)
-*)
usage ;;
*)
@@
-36,32
+41,30
@@
case "$#" in
echo "Where would you want to push today?"
usage ;;
esac
echo "Where would you want to push today?"
usage ;;
esac
-if test ",$has_all,$do_tags," = ",--all,yes,"
-then
- do_tags=
-fi
. git-parse-remote
remote=$(get_remote_url "$@")
. git-parse-remote
remote=$(get_remote_url "$@")
-case "$has_all" in
---all) set x ;;
-'') set x $(get_remote_refs_for_push "$@") ;;
-esac
-shift
-case "$do_tags" in
-yes)
- set "$@" $(cd "$GIT_DIR/refs" && find tags -type f -print) ;;
+case "$has_all" in
+--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
esac
-# Now we have explicit refs from the command line or from remotes/
-# shorthand, or --tags. Falling back on the current branch if we still
-# do not have any may be an alternative, but prevent mistakes for now.
+shift ;# away the initial 'x'
-case "$#,$has_all" in
-0,)
- die "No refs given to be pushed." ;;
-esac
+# $# 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
git://*)
case "$remote" in
git://*)
@@
-74,6
+77,7
@@
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
test "$has_all" && set x "$has_all" "$@" && shift
test "$has_force" && set x "$has_force" "$@" && shift
test "$has_exec" && set x "$has_exec" "$@" && shift
+test "$has_thin" && set x "$has_thin" "$@" && shift
case "$remote" in
http://* | https://*)
case "$remote" in
http://* | https://*)