diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-15 23:27:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-15 23:59:12 -0800 |
| commit | 42301e34a2736b091738d4ca6a23fd90bd1f1837 (patch) | |
| tree | 6ac2b20f996afda0055f2d7d43fb4f47b8ee0361 | |
| parent | fec9ebf16c948bcb4a8b88d0173ee63584bcde76 (diff) | |
| download | git-42301e34a2736b091738d4ca6a23fd90bd1f1837.tar.gz | |
git-push: fix --tags and document it.
Previously 'git-push --tags dst', used information from
remotes/dst to determine which refs to push; this patch corrects
it, and also documents the --tags option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-push.txt | 7 | ||||
| -rwxr-xr-x | git-push.sh | 27 |
2 files changed, 21 insertions, 13 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 2254bac16e..365cfd4105 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects. SYNOPSIS -------- -'git-push' [--all] [--force] <repository> <refspec>... +'git-push' [--all] [--tags] [--force] <repository> <refspec>... DESCRIPTION ----------- @@ -29,6 +29,11 @@ include::pull-fetch-param.txt[] Instead of naming each ref to push, specifies all refs to be pushed. +\--tags:: + All refs under `$GIT_DIR/refs/tags` are pushed, in + addition to refspecs explicitly listed on the command + line. + -f, \--force:: Usually, the command refuses to update a local ref that is not an ancestor of the remote ref used to overwrite it. diff --git a/git-push.sh b/git-push.sh index 136093bf13..ce2ad71382 100755 --- 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 @@ -36,23 +36,26 @@ case "$#" in 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 "$@") + 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 -case "$do_tags" in -yes) - set "$@" $(cd "$GIT_DIR/refs" && find tags -type f -print) ;; -esac +shift ;# away the initial 'x' # Now we have explicit refs from the command line or from remotes/ # shorthand, or --tags. Falling back on the current branch if we still |