From: Michael J Gruber <git@drmicha•warpmail.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org, "Shawn O. Pearce" <spearce@spearce•org>,
Petr Baudis <pasky@suse•cz>, Andreas Gruenbacher <agruen@suse•de>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] Document and test the new % shotcut for the tracked branch
Date: Fri, 20 Mar 2009 11:38:56 +0100 [thread overview]
Message-ID: <49C37240.6070604@drmicha.warpmail.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0903201128380.10279@pacific.mpi-cbg.de>
Johannes Schindelin venit, vidit, dixit 20.03.2009 11:31:
> Hi,
>
> On Fri, 20 Mar 2009, Michael J Gruber wrote:
>
>> Signed-off-by: Michael J Gruber <git@drmicha•warpmail.net>
>> ---
>
> That is brutal. First shot, then cut.
I'm sorry! But you're a tough guy, you'll recover...
>
>> Johannes Schindelin venit, vidit, dixit 20.03.2009 10:29:
>>>
>>> Often, it is quite interesting to inspect the branch tracked by a
>>> given branch. This patch introduces a nice notation to get at the
>>> tracked branch: 'BEL<branch>' can be used to access that tracked
>>> branch.
>>>
>>> A special shortcut 'BEL' refers to the branch tracked by the current
>>> branch.
>>>
>>> Suggested by Pasky and Shawn.
>>>
>>> This patch extends the function introduced to handle the nth-last
>>> branch (via the {-<n>} notation); therefore that function name was
>>> renamed to something more general.
>>>
>>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx•de>
>>
>> I guess you beat me to it then, which is fine.
>
> I had it ready yesterday! But the real problem is not addressed by your
> patch, either: '%<branch>' is a legal branch name.
No, of course, I just added doc+test to your patch v2, since you seemed
to encourage people to do so.
I would have sent it out yesterday if my tests hadn't shown a problem.
(Or did you misunderstand my doc notation? <branch> = ${branch} =
"branch" placeholder for a generic branch name)
> I briefly considered <branch>^{tracked}, but
>
> - the ^{} codepath does not try to substitute branch _names_, so we'd have
> to duplicate that ^{} detection, and,
>
> - it is really cumbersome to write.
>
>> But haven't you seen my note about the failing test either? The code
>> below tests with branches which track local branches. merge and remote
>> is set for the branch in question ("tracking"), it's just that remote is
>> ".". It seems that the remote.c code does not set up merge info for
>> these branches.
>
> I have seen it, it's just not my itch, and I am busy enough as it is.
If I'm not totally off-track (which I may well be) then that problem
should show up with other uses of the merge/track setting as well. I
guess it's just that everyone tracks remote branches, not local ones.
I'll see if I have time...
>> <Goes to figure out how to enter BEL...>
>
> Ctrl-v Ctrl-g
>
> Ciao,
> Dscho
Bing bing bing...
Michael
next prev parent reply other threads:[~2009-03-20 10:40 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200903181448.50706.agruen@suse.de>
2009-03-18 18:26 ` Git {log,diff} against tracked branch? Petr Baudis
2009-03-18 21:12 ` [PATCH] Introduce %<branch> as shortcut to the tracked branch Johannes Schindelin
2009-03-18 21:41 ` Andreas Gruenbacher
2009-03-18 21:46 ` [PATCH v2] " Johannes Schindelin
2009-03-18 21:58 ` Andreas Gruenbacher
2009-03-18 22:43 ` Johannes Schindelin
2009-03-18 22:34 ` Junio C Hamano
2009-03-18 22:46 ` Johannes Schindelin
2009-03-19 14:52 ` Michael J Gruber
2009-03-19 15:17 ` Michael J Gruber
2009-03-20 0:23 ` Johannes Schindelin
2009-03-20 0:38 ` ref name troubles, was " Johannes Schindelin
2009-03-20 0:40 ` Shawn O. Pearce
2009-03-20 0:44 ` Shawn O. Pearce
2009-03-20 5:59 ` Sverre Rabbelier
2009-03-20 9:29 ` [PATCH v3] Introduce BEL<branch> " Johannes Schindelin
2009-03-20 9:42 ` Wincent Colaiuta
2009-03-20 9:54 ` Johannes Schindelin
2009-03-20 12:33 ` Santi Béjar
2009-03-20 12:45 ` Andreas Gruenbacher
2009-03-20 13:05 ` Matthieu Moy
2009-03-20 12:46 ` Johannes Schindelin
2009-03-20 12:53 ` Mikael Magnusson
2009-03-20 14:00 ` Johannes Schindelin
2009-03-20 10:04 ` [PATCH] Document and test the new % shotcut for " Michael J Gruber
2009-03-20 10:31 ` Johannes Schindelin
2009-03-20 10:38 ` Michael J Gruber [this message]
2009-03-20 11:16 ` Petr Baudis
2009-03-20 11:48 ` Johannes Schindelin
2009-03-22 17:40 ` Petr Baudis
2009-03-20 14:15 ` Michael J Gruber
2009-03-20 16:17 ` [PATCH v4] Introduce %<branch> as shortcut to " Johannes Schindelin
2009-03-20 17:03 ` Junio C Hamano
2009-03-20 17:32 ` Johannes Schindelin
2009-03-20 18:02 ` Junio C Hamano
2009-03-20 19:36 ` Jeff King
2009-03-20 20:28 ` Julian Phillips
2009-03-20 20:50 ` Jeff King
2009-03-20 23:08 ` Julian Phillips
2009-03-20 23:20 ` Sverre Rabbelier
2009-03-20 23:41 ` Julian Phillips
2009-03-20 23:45 ` Sverre Rabbelier
2009-03-21 0:35 ` Andreas Gruenbacher
2009-03-21 1:10 ` Miles Bader
2009-03-21 13:24 ` Julian Phillips
2009-03-21 13:28 ` Julian Phillips
2009-03-20 17:08 ` Björn Steinbrink
2009-03-20 6:05 ` ref name troubles, was Re: [PATCH v2] " Jeff King
2009-03-20 6:57 ` Junio C Hamano
2009-03-20 9:30 ` Johannes Schindelin
2009-03-20 11:12 ` Petr Baudis
2009-03-20 11:46 ` Johannes Schindelin
2009-03-20 11:50 ` Petr Baudis
2009-03-20 11:57 ` Johannes Schindelin
2009-03-20 14:31 ` Michael J Gruber
2009-03-20 15:01 ` Johannes Schindelin
2009-03-20 15:12 ` Michael J Gruber
2009-03-20 16:47 ` Junio C Hamano
2009-03-20 19:34 ` Daniel Barkalow
2009-03-20 21:48 ` Johannes Schindelin
2009-03-21 21:00 ` 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=49C37240.6070604@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=agruen@suse$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=pasky@suse$(echo .)cz \
--cc=spearce@spearce$(echo .)org \
/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