git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: unlisted-recipients:; (no To-header on input)
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>, Petr Baudis <pasky@suse.cz>,
	Andreas Gruenbacher <agruen@suse.de>,
	git@vger.kernel.org
Subject: Re: [PATCH v2] Introduce %<branch> as shortcut to the tracked   branch
Date: Thu, 19 Mar 2009 16:17:52 +0100	[thread overview]
Message-ID: <49C26220.8050603@drmicha.warpmail.net> (raw)
In-Reply-To: <49C25C4A.2010202@drmicha.warpmail.net>

Michael J Gruber venit, vidit, dixit 19.03.2009 15:52:
> Johannes Schindelin venit, vidit, dixit 18.03.2009 23:46:
>> Hi,
>>
>> On Wed, 18 Mar 2009, Junio C Hamano wrote:
>>
>>> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>>>
>>>> Suggested by Pasky.
>>>>
>>>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>>>
>>> In the longer term who suggested matters much less than why such a 
>>> feature is desirable, how it is used, and without it what is impossible 
>>> and/or cumbersome.  What's the motivation behind this?
>>>
>>> You do not have to explain it to me, but you should explain it to the 
>>> history that records this commit, and to the users who read doccos.
>>
>> And that's not all... Documentation updates and tests for % and %<branch> 
>> are missing, too.
>>
>> My main motivation to make this patch was to see how fast I could come up 
>> with something working that does not hurt my eyes.
>>
>> But I do not have time to do more today: My main project as well as Git 
>> got accepted into the Google Summer of Code program, so I am even more 
>> swamped than usually.
>>
>> So... if anybody feels like it, I would be very thankful for a proper 
>> commit message, documentation and tests...
> 
> Just a quick note that I'm feeling like it... Though it seems this does
> not quite work with local branches, i.e. a branch created with
> 
> git checkout --track -b tracking tracked
> 
> with "tracked" being a local branch. I don't see why on first inspection
> of the code (branch.tracking.merge = refs/heads/tracked, so what), but
> maybe you will...

So, for a local branch, branch_get() returns a branch without merge info
even though it's in the config (the remote is "." here). "git branch
--track" is specifically meant for (branching off a ) local branch,
because it's the default for remote branches anyway. Right? Does not
look right.

Michael

  reply	other threads:[~2009-03-19 15:20 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 [this message]
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
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=49C26220.8050603@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=agruen@suse.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pasky@suse.cz \
    /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).