Skip to content

Commit

Permalink
git-push: fix --tags and document it.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jan 16, 2006
1 parent fec9ebf commit 42301e3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
7 changes: 6 additions & 1 deletion Documentation/git-push.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------
Expand All @@ -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.
Expand Down
27 changes: 15 additions & 12 deletions git-push.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 42301e3

Please sign in to comment.