From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Björn Steinbrink" <B.Steinbrink@gmx.de>,
"Michael J Gruber" <git@drmicha.warpmail.net>,
"Pete Wyckoff" <pw@padd.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Introduce <branch>@{tracked} as shortcut to the tracked branch
Date: Thu, 10 Sep 2009 10:16:18 -0400 [thread overview]
Message-ID: <20090910141618.GB4942@coredump.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0909101135590.8306@pacific.mpi-cbg.de>
On Thu, Sep 10, 2009 at 11:36:42AM +0200, Johannes Schindelin wrote:
> diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
> index 82045a2..09a2145 100644
> --- a/Documentation/git-rev-parse.txt
> +++ b/Documentation/git-rev-parse.txt
> @@ -231,6 +231,10 @@ when you run 'git-merge'.
> * The special construct '@\{-<n>\}' means the <n>th branch checked out
> before the current one.
>
> +* The suffix '@{tracked}' to a ref (short form 'blabla@{t}') refers to
> + the branch tracked by that ref. If no ref was specified, it means the
> + branch tracked by the current branch.
> +
It looks like the code dereferences symbolic refs when doing the lookup
(so HEAD@{t} will find the upstream of the current branch), which I
think is the best thing to do. However, that does make it behave
slightly differently than HEAD@{2.minutes.ago}, so it may be worth
adding a sentence to this paragraph like:
If the ref is a symbolic ref, it is dereferenced before searching
for the upstream ref.
And we may want to add a test for HEAD, as well.
Also, I seem to be able to stimulate a segfault on a detached HEAD, but
I haven't investigated it yet.
-Peff
next prev parent reply other threads:[~2009-09-10 14:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-04 13:54 tracking branch for a rebase Pete Wyckoff
2009-09-04 14:31 ` Michael J Gruber
2009-09-04 18:18 ` Jeff King
2009-09-04 18:59 ` Björn Steinbrink
2009-09-05 6:12 ` Jeff King
2009-09-05 14:01 ` Björn Steinbrink
2009-09-05 14:28 ` Jeff King
2009-09-07 5:05 ` Junio C Hamano
2009-09-07 8:14 ` Michael J Gruber
2009-09-07 8:25 ` Junio C Hamano
2009-09-07 8:44 ` Jeff King
2009-09-07 9:06 ` Michael J Gruber
2009-09-07 8:43 ` Jeff King
2009-09-07 9:29 ` Johannes Schindelin
2009-09-07 9:53 ` Michael J Gruber
2009-09-08 23:17 ` Julian Phillips
2009-09-09 10:45 ` Jeff King
2009-09-10 6:42 ` Junio C Hamano
2009-09-10 7:47 ` Johannes Schindelin
2009-09-10 9:36 ` [PATCH] Introduce <branch>@{tracked} as shortcut to the tracked branch Johannes Schindelin
2009-09-10 9:44 ` Michael J Gruber
2009-09-10 10:14 ` Johannes Schindelin
2009-09-10 10:18 ` Johan Herland
2009-09-10 10:59 ` Michael J Gruber
2009-09-10 12:29 ` Johan Herland
2009-09-10 13:35 ` Johannes Schindelin
2009-09-10 14:17 ` Michael J Gruber
2009-09-10 11:11 ` Jeff King
2009-09-10 18:29 ` Junio C Hamano
2009-10-02 14:54 ` Björn Steinbrink
2009-09-10 14:16 ` Jeff King [this message]
2009-09-10 14:26 ` Jeff King
2009-09-10 15:24 ` Johannes Schindelin
2009-09-10 15:25 ` [PATCH v2] Introduce <branch>@{upstream} " Johannes Schindelin
2009-09-10 15:55 ` Jeff King
2009-09-10 16:18 ` Johannes Schindelin
2009-09-10 15:22 ` [PATCH] Introduce <branch>@{tracked} " Johannes Schindelin
2009-09-11 4:54 ` tracking branch for a rebase Junio C Hamano
2009-09-05 17:59 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090910141618.GB4942@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=B.Steinbrink@gmx.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).