Re: [PATCH] Documentation/git-push.txt: fix typo in remote tracking branch path
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 27, 2012, 01:30 UTC
- Message-ID
- <7vy5hnomsl.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1353977748-17110-1-git-send-email-bcasey@nvidia.com>
Brandon Casey <bcasey@nvidia.com> writes:
Show 14 quoted lines
> From: Brandon Casey <drafnel@gmail.com> > > This example in the documentation seems to be trying to describe the likely > remote tracking branch that will be updated by a push to the "origin" remote > with the destination branch 'satellite/master', but it forgot to specify > the remote name in the path specification. > > So, > > refs/remotes/satellite/master > > should be spelled like > > refs/remotes/origin/satellite/master
I might make sense to rename 'origin' to 'mothership' in that example and explain that this is emulating 'git fetch' run on the mothership to integrate the work done on 'satellite' using 'git push' in the opposite direction, which is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd).
If you were to run 'git fetch' on the mothership to intgrate the work on the 'satellite', it would have a remote called 'satellite', and would keep remote-tracking branches for the branches local to 'satellite' in the 'refs/remotes/satellite/' hierarchy. You would push your local 'master' to their 'refs/remotes/satellite/master', to emulate 'git fetch' done on the mothership in the reverse direction.
So refs are correct. The context is not sufficiently explained.
Show 21 quoted lines
> > Signed-off-by: Brandon Casey <bcasey@nvidia.com> > --- > Documentation/git-push.txt | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt > index fe46c42..a18f929 100644 > --- a/Documentation/git-push.txt > +++ b/Documentation/git-push.txt > @@ -387,8 +387,8 @@ the ones in the examples below) can be configured as the default for > `git push origin master:satellite/master dev:satellite/dev`:: > Use the source ref that matches `master` (e.g. `refs/heads/master`) > to update the ref that matches `satellite/master` (most probably > - `refs/remotes/satellite/master`) in the `origin` repository, then > - do the same for `dev` and `satellite/dev`. > + `refs/remotes/origin/satellite/master`) in the `origin` repository, > + then do the same for `dev` and `satellite/dev`. > > `git push origin HEAD:master`:: > Push the current branch to the remote ref matching `master` in the