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 5/5] implement @{publish} shorthand
Date: Thu, 23 Jan 2014 16:16:06 -0800 [thread overview]
Message-ID: <xmqqob32s08p.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140108093716.GE15720@sigill.intra.peff.net> (Jeff King's message of "Wed, 8 Jan 2014 04:37:16 -0500")
Jeff King <peff@peff•net> writes:
> In a triangular workflow, you may have a distinct
> @{upstream} that you pull changes from, but publish by
> default (if you typed "git push") to a different remote (or
> a different branch on the remote). It may sometimes be
> useful to be able to quickly refer to that publishing point
> (e.g., to see which changes you have that have not yet been
> published).
>
> This patch introduces the <branch>@{publish} shorthand (or
> "@{pu}" to be even shorter). It refers to the tracking
> branch of the remote branch to which you would push if you
> were to push the named branch. That's a mouthful to explain,
> so here's an example:
>
> $ git checkout -b foo origin/master
> $ git config remote.pushdefault github
> $ git push
>
> Signed-off-by: Jeff King <peff@peff•net>
> ---
As there is no @{pu} in publish_mark() as far as I can see, and also
I found it is a bit unclear what the example in the last paragraph
wants to illustrate, I'll reword the above as the following before
merging it to 'next'.
This patch introduces the <branch>@{publish} shorthand that
refers to the tracking branch of the remote branch to which
you would push if you were to push the named branch.
That's a mouthful to explain, so here's an example:
$ git checkout -b foo origin/master
$ git config remote.pushdefault github
$ git push
With this, foo@{upstream} and foo@{publish} would be origin/master
and github/foo, respectively (assuming that "git fetch github" is
configured to use refs/remotes/github/* remote-tracking branches).
> The implementation feels weird, like the "where do we push to" code
> should be factored out from somewhere else. I think what we're doing
> here is not _wrong_, but I don't like repeating what "git push" is doing
> elsewhere. And I just punt on "simple" as a result. :)
I think we can polish that in-tree.
Thanks.
next prev parent reply other threads:[~2014-01-24 0:16 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 20:29 [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Ramkumar Ramachandra
2014-01-07 20:30 ` Ramkumar Ramachandra
2014-01-07 20:40 ` Jeff King
2014-01-07 20:48 ` Junio C Hamano
2014-01-07 21:02 ` Ramkumar Ramachandra
2014-01-07 21:16 ` Jeff King
2014-01-07 21:35 ` Ramkumar Ramachandra
2014-01-08 9:33 ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Jeff King
2014-01-08 9:34 ` [PATCH 1/5] sha1_name: refactor upstream_mark Jeff King
2014-01-08 9:34 ` [PATCH 2/5] interpret_branch_name: factor out upstream handling Jeff King
2014-01-08 12:37 ` Ramkumar Ramachandra
2014-01-08 9:35 ` [PATCH 3/5] branch_get: return early on error Jeff King
2014-01-08 9:35 ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08 10:27 ` Jeff King
2014-01-08 10:47 ` [PATCH] t5531: further "matching" fixups Jeff King
2014-01-10 23:34 ` Junio C Hamano
2014-01-11 4:22 ` Jeff King
2014-01-08 11:09 ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08 9:37 ` [PATCH 5/5] implement @{publish} shorthand Jeff King
2014-01-08 23:42 ` Junio C Hamano
2014-01-09 18:20 ` Jeff King
2014-01-09 21:24 ` Junio C Hamano
2014-01-09 8:39 ` Philip Oakley
2014-01-09 22:03 ` Jeff King
2014-01-09 22:24 ` Junio C Hamano
2014-01-24 0:16 ` Junio C Hamano [this message]
2014-01-24 21:35 ` Jeff King
2014-01-24 22:05 ` Ramkumar Ramachandra
2014-01-24 23:12 ` Junio C Hamano
2014-02-15 11:50 ` Philip Oakley
2014-02-18 8:52 ` Jeff King
2014-02-18 13:10 ` Johan Herland
2014-02-18 19:52 ` Junio C Hamano
2014-01-08 12:40 ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Ramkumar Ramachandra
2014-01-07 20:36 ` [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Junio C Hamano
2014-01-07 20:40 ` Ramkumar Ramachandra
2014-01-07 20:42 ` Junio C Hamano
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=xmqqob32s08p.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