Cumulative update of merge-recursive in C

diff --git a/git-push.sh b/git-push.sh
index 1c5cf80f8786eb20c6092a8fbce48e1f1c1cb9e1..21775fc21ae6668b04972ef942b2d90a789f4af6 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -1,6 +1,6 @@
 #!/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
@@ -8,17 +8,25 @@ USAGE='[--all] [--force] <repository> [<refspec>...]'
 has_all=
 has_force=
 has_exec=
+has_thin=--thin
 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" ;;
+       --thin)
+               ;; # noop
+       --no-thin)
+               has_thin= ;;
        -*)
                 usage ;;
         *)
@@ -36,11 +44,27 @@ 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 default refspec to push from remotes/ file.
+# we will let git-send-pack to do its "matching refs" thing.
 
 case "$remote" in
 git://*)
@@ -53,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_thin" && set x "$has_thin" "$@" && shift
 
 case "$remote" in
 http://* | https://*)