Browse Source

git-push: documentation and tests for pushing only branches

Commit 098e711e caused git-push to match only branches when
considering which refs to push. This patch updates the
documentation accordingly and adds a test for this behavior.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 18 years ago committed by Junio C Hamano
parent
commit
5c633a4cbe
  1. 4
      Documentation/git-push.txt
  2. 4
      Documentation/git-send-pack.txt
  3. 10
      t/t5400-send-pack.sh

4
Documentation/git-push.txt

@ -48,7 +48,7 @@ even if it does not result in a fast forward update. @@ -48,7 +48,7 @@ even if it does not result in a fast forward update.
Note: If no explicit refspec is found, (that is neither
on the command line nor in any Push line of the
corresponding remotes file---see below), then all the
refs that exist both on the local side and on the remote
heads that exist both on the local side and on the remote
side are updated.
+
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
@ -61,7 +61,7 @@ the remote repository. @@ -61,7 +61,7 @@ the remote repository.

\--all::
Instead of naming each ref to push, specifies that all
refs be pushed.
refs under `$GIT_DIR/refs/heads/` be pushed.

\--tags::
All refs under `$GIT_DIR/refs/tags` are pushed, in

4
Documentation/git-send-pack.txt

@ -32,7 +32,7 @@ OPTIONS @@ -32,7 +32,7 @@ OPTIONS

\--all::
Instead of explicitly specifying which refs to update,
update all refs that locally exist.
update all heads that locally exist.

\--force::
Usually, the command refuses to update a remote ref that
@ -70,7 +70,7 @@ With '--all' flag, all refs that exist locally are transferred to @@ -70,7 +70,7 @@ With '--all' flag, all refs that exist locally are transferred to
the remote side. You cannot specify any '<ref>' if you use
this flag.

Without '--all' and without any '<ref>', the refs that exist
Without '--all' and without any '<ref>', the heads that exist
both on the local side and on the remote side are updated.

When one or more '<ref>' are specified explicitly, it can be either a

10
t/t5400-send-pack.sh

@ -113,4 +113,14 @@ test_expect_success \ @@ -113,4 +113,14 @@ test_expect_success \
! git diff .git/refs/heads/master victim/.git/refs/heads/master
'

test_expect_success \
'pushing does not include non-head refs' '
mkdir parent && cd parent &&
git-init && touch file && git-add file && git-commit -m add &&
cd .. &&
git-clone parent child && cd child && git-push --all &&
cd ../parent &&
git-branch -a >branches && ! grep -q origin/master branches
'

test_done

Loading…
Cancel
Save