Re: [RFC/PATCH 1/2] remote tracking: return the tracking branch for the given branches

From: Jakub Narebski <jnareb@gmail.com>
Date: Jun 18, 2009, 14:17 UTC
Message-ID: <200906181617.07802.jnareb@gmail.com>
In-Reply-To: <adf1fd3d0906180655q5c142889r3375169b6cf1f8b0@mail.gmail.com>

On Thu, 18 June 2009, Santi Béjar wrote:

> 2009/6/18 Jakub Narebski <jnareb@gmail.com>:

[cut]

Show 10 quoted lines

> >
> >  $ git remote tracking <remote> <remote branch>
> >
> > would show all local branches that track <remote branch>, and have
> > <remote> as default remote,
> 
> Maybe my description is unclear, but it's not about local branches
> which track <branch> on <remote>, it is about the local branch
> representation of the remote branch, i.e. not 'master' but
> origin/master (git remote tracking origin master in a default clone).

Ah, the problem with the same (or similar) name for two different things. If we have local branch 'local' set to track branch 'master' on remote 'origin', we have:

   /------- local repository ------\            /- origin -\
  /                                 \          /            \
  |                                 |          |            |
  'local'  -------->  'origin/master' -----------> 'master' 
  refs/heads/local    refs/remotes/origin/master   refs/heads/master

  branch.local.remote = origin
  branch.local.merge  = refs/heads/master

  remote.origin.fetch = +refs/heads/*:refs/remotes/origin/*

'origin/master' is called remote-TRACKING branch (for 'master' branch on remote 'origin'). Setting up automerge information for local branch 'local' which _follows_ branch 'master' on remote 'origin' is done using --TRACK option to git-branch.

Therefore the confusion.

Do I understand correctly that you want for

  $ git remote tracking origin master

to return

  origin/master

(and perhaps also origin/HEAD?).

-- 
Jakub Narebski
Poland