From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Ramkumar Ramachandra <artagnon@gmail•com>,
Git List <git@vger•kernel.org>
Subject: Re: [PATCH 3/3] remote: introduce and fill branch->pushremote
Date: Mon, 13 Jan 2014 12:15:08 -0800 [thread overview]
Message-ID: <xmqqtxd763lf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140113185946.GA30279@sigill.intra.peff.net> (Jeff King's message of "Mon, 13 Jan 2014 13:59:47 -0500")
Jeff King <peff@peff•net> writes:
> It does not matter for actually pushing, because to do a non-default
> push, you must always specify a remote. But "@{publish}" will ask the
> question "even if I am on 'side' now, what would happen if I were to
> default-push on 'master'?".
In a similar wording to yours, it can be said that B@{upstream} is
"what would happen if I were to default-pull on 'B'?".
A related tangent is what should B@{publish} should yield when there
is no triangular configuration variables like remote.pushdefault,
branch.B.pushremote and a possible future extension branch.B.push
are defined. The definition you gave, i.e. "if I were to
default-push", gives a good guideline, I think.
I.e. "git push origin master" does tell us to push out 'master', but
it does not explicitly say what ref to update. It may be set to
update their remotes/satellite/master when we are emulating a fetch
in reverse by pushing, via e.g.
[remote "origin"]
push = refs/heads/master:refs/remotes/satellite/master
and it would be intuitive if we make "master@{publish}" resolve to
"refs/remotes/satellite/master" in such a case.
One thing that makes things a bit fuzzy is what should happen if
you have more than one push destinations. For example:
[remote "home"]
pushurl = ...
push = refs/heads/master:refs/remotes/satellite/master
[remote "github"]
pushurl = ...
mirror
[remote]
pushdefault = ???
"git push home" updates their 'refs/remotes/satellite/master' with
my 'master' with the above, while "git push github" will update
their 'refs/heads/master' with 'master'.
We can say master@{publish} is 'remotes/satellite/master' if
remote.pushdefault (or 'branch.master.pushremote") is set to 'home',
it is 'master' if it is 'github', and if "git push" while sitting on
'master' does not push it anywhere then master@{publish} is an
error. There may be a better definition of what "if I were to
default-push" really means, but I don't think of any offhand.
next prev parent reply other threads:[~2014-01-13 20:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-12 17:11 [PATCH 0/3] Minor preparation for @{publish} Ramkumar Ramachandra
2014-01-12 17:11 ` [PATCH 1/3] t1507 (rev-parse-upstream): fix typo in test title Ramkumar Ramachandra
2014-01-12 17:11 ` [PATCH 2/3] interpret_branch_name: factor out upstream handling Ramkumar Ramachandra
2014-01-12 17:11 ` [PATCH 3/3] remote: introduce and fill branch->pushremote Ramkumar Ramachandra
2014-01-13 8:34 ` Jeff King
2014-01-13 11:22 ` Ramkumar Ramachandra
2014-01-13 18:59 ` Jeff King
2014-01-13 20:15 ` Junio C Hamano [this message]
2014-01-13 20:27 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtxd763lf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=artagnon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox