From: "Santi Béjar" <santi@agolina.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH 1/2] remote tracking: return the tracking branch for the given branches
Date: Thu, 18 Jun 2009 15:22:30 +0200 [thread overview]
Message-ID: <adf1fd3d0906180622n25169f51n6aa249e9167cbc38@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0906181433330.4297@intel-tinevez-2-302>
2009/6/18 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> Hi,
>
> On Thu, 18 Jun 2009, Santi Béjar wrote:
>
>> diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
>> index 9e2b4ea..e444899 100644
>> --- a/Documentation/git-remote.txt
>> +++ b/Documentation/git-remote.txt
>> @@ -17,6 +17,7 @@ SYNOPSIS
>> 'git remote show' [-n] <name>
>> 'git remote prune' [-n | --dry-run] <name>
>> 'git remote update' [-p | --prune] [group | remote]...
>> +'git remote tracking' <name> <branch>...
>>
>> DESCRIPTION
>> -----------
>> @@ -128,6 +129,12 @@ be updated. (See linkgit:git-config[1]).
>> +
>> With `--prune` option, prune all the remotes that are updated.
>>
>> +'tracking'::
>> +
>> +Returns the tracking branch for the given remote (<name>) and branch
>> +(<branch>). Note that <branch> must exactly match the left hand side of
>> +the refspec of the given remote.
>> +
>
> From that description, it is not clear to me if the branch is the _remote_
> branch, the branch _on_ the remote, or the local branch.
OK. s/and branch/and remote branch/
>
> If it is the remote branch (or the branch on the remote), I wonder how you
> deal with ambiguities, as I can easily create hundreds of branches
> tracking the same remote branch.
AFAICS from remote_find_tracking (and some tests), it picks the first match.
So, additional text could be: In case of multiple matches, it picks
the first one.
Santi
next prev parent reply other threads:[~2009-06-18 13:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-18 7:57 [RFC/PATCH 0/2] Support for arbitrary mapping for "git pull --rebase" Santi Béjar
2009-06-18 7:57 ` [RFC/PATCH 1/2] remote tracking: return the tracking branch for the given branches Santi Béjar
2009-06-18 11:52 ` Paolo Bonzini
2009-06-18 13:23 ` Santi Béjar
2009-06-18 12:35 ` Johannes Schindelin
2009-06-18 13:22 ` Santi Béjar [this message]
2009-06-18 13:44 ` Jakub Narebski
2009-06-18 13:55 ` Santi Béjar
2009-06-18 14:17 ` Jakub Narebski
2009-06-18 14:40 ` Santi Béjar
2009-06-18 19:01 ` Santi Béjar
2009-06-18 19:19 ` Junio C Hamano
2009-06-18 21:31 ` Santi Béjar
2009-06-18 7:57 ` branch.<branch>.merge and --format='%(upstream)' Santi Béjar
2009-06-18 7:57 ` [RFC/PATCH 2/2] get_remote_merge_branch: Support for arbitrary mapping Santi Béjar
2009-06-18 9:27 ` Santi Béjar
2009-06-18 8:41 ` [RFC/PATCH 0/2] Support for arbitrary mapping for "git pull --rebase" Johannes Schindelin
2009-06-18 9:24 ` Santi Béjar
2009-06-19 13:42 ` Santi Béjar
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=adf1fd3d0906180622n25169f51n6aa249e9167cbc38@mail.gmail.com \
--to=santi@agolina.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).