git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Matthieu Moy <matthieu.moy@imag.fr>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	Jeff King <peff@peff.net>,
	John Szakmeister <john@szakmeister.net>
Subject: Re: [PATCH v3 2/8] Add concept of 'publish' branch
Date: Fri, 11 Apr 2014 12:48:39 -0700	[thread overview]
Message-ID: <xmqqr453r6js.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1397239151-2391-3-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Fri, 11 Apr 2014 12:59:05 -0500")

Felipe Contreras <felipe.contreras@gmail.com> writes:

> The publish branch is the branch the user wants to push to, akin to the
> upstream branch, which is the branch the user wants to use as a
> baseline. It overrides other configurations, such as push.default, and
> remote.<name>.push.
>
> The upstream branch is:
>
>   branch.$name.remote
>   branch.$name.merge

These two configuration variables are *NOT* the "upstream branch";
it is more like "the upstream branch of $name is _defined_ with
these two variables".

For example, with:

	[remote "foo"]
        	fetch = refs/heads/*:refs/remotes/foo/*
	[branch "bar"]
        	remote = foo
                merge = baz

The upstream branch of 'bar' is refs/remotes/foo/baz, and that is
determined by consulting these two variables, branch.bar.remote and
branch.bar.merge to learn that we look at refs/heads/baz from foo
and also refs/remotes/foo/baz is where we keep a copy of that.

> The publish branch is:
>
>   branch.$name.pushremote
>   branch.$name.push

Can you give a description for "the publish branch for $name" here
in a way similar to "the upstream" I gave an example above, so that
anybody reading this log message can answer questions like...

When the end users say master@{publish}, what conceptually are they
naming?  Can they use master@{publish} in a way similar to:

 $ git log master@{upstream}..master

that gives us what we did since we forked, because master@{upstream}
names the remote-tracking branch we locally have for the branch our
'master' integrates with?

Thanks.

  reply	other threads:[~2014-04-11 19:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-11 17:59 [PATCH v3 0/8] Introduce publish tracking branch Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 1/8] t5516 (fetch-push): fix test restoration Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 2/8] Add concept of 'publish' branch Felipe Contreras
2014-04-11 19:48   ` Junio C Hamano [this message]
2014-04-11 17:59 ` [PATCH v3 3/8] branch: add --set-publish-to option Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 4/8] push: add --set-publish option Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 5/8] branch: display publish branch Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 6/8] sha1_name: cleanup interpret_branch_name() Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 7/8] sha1_name: simplify track finding Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 8/8] sha1_name: add support for @{publish} marks Felipe Contreras
2014-04-11 18:49 ` [PATCH v3 0/8] Introduce publish tracking branch Matthieu Moy

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=xmqqr453r6js.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=john@szakmeister.net \
    --cc=matthieu.moy@imag.fr \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).