Tracking remote branches

Tracking remote branches

[Thiago Farina]

Hi,

I'm not understanding what is happening here. I tried to track a
remote branch, origin/maint from git. So I did:
$ git branch --track maint origin/maint
$ git checkout maint

I know that I could do simply, instead of above:
$ git checkout --track -b maint origin/maint

OK, now I switched to maint branch. And then I did:
$ git status

# On branch maint
# Changes to be committed
#    (use "git reset HEAD <file>..." to unstage)
#
#          new file:    git-remote-curl
#          new file:    git-replace
#

What happened here? What I have to do now?

Re: Tracking remote branches

[Nicolas Sebrecht]

The 13/09/09, Thiago Farina wrote:
> Hi,
> 
> I know that I could do simply, instead of above:
> $ git checkout --track -b maint origin/maint

Or
$ git checkout -t origin/maint

> OK, now I switched to maint branch. And then I did:
> $ git status
> 
> # On branch maint
> # Changes to be committed
> #    (use "git reset HEAD <file>..." to unstage)
> #
> #          new file:    git-remote-curl
> #          new file:    git-replace
> #
> 
> What happened here? What I have to do now?

You've probably added these files to the index, mistakenly. If you don't
have uncommited changes, try :

  git checkout -f master
  git branch -D maint
  git checkout -t origin/maint
  git status

The files should now be shown as "Untracked files".

-- 
Nicolas Sebrecht

Re: Tracking remote branches

[Thiago Farina]

On Mon, Sep 14, 2009 at 2:01 AM, Nicolas Sebrecht <nicolas.s.dev@gmx.fr> wrote:
> The 13/09/09, Thiago Farina wrote:
>> Hi,
>>
>> I know that I could do simply, instead of above:
>> $ git checkout --track -b maint origin/maint
>
> Or
> $ git checkout -t origin/maint
>
>> OK, now I switched to maint branch. And then I did:
>> $ git status
>>
>> # On branch maint
>> # Changes to be committed
>> #    (use "git reset HEAD <file>..." to unstage)
>> #
>> #          new file:    git-remote-curl
>> #          new file:    git-replace
>> #
>>
>> What happened here? What I have to do now?
>
> You've probably added these files to the index, mistakenly. If you don't
> have uncommited changes, try :
>
>  git checkout -f master
>  git branch -D maint
>  git checkout -t origin/maint
>  git status
>
> The files should now be shown as "Untracked files".
Yeah, now the files has this status. But I don't have anything related
with these files, I didn't add these files.
Why these files has this status? Is supposed to me to do something
about that when this situation occurs?

Re: Re: Tracking remote branches

[Heiko Voigt]

On Mon, Sep 14, 2009 at 03:30:10PM -0300, Thiago Farina wrote:
> On Mon, Sep 14, 2009 at 2:01 AM, Nicolas Sebrecht <nicolas.s.dev@gmx.fr> wrote:
> > The 13/09/09, Thiago Farina wrote:
> > $ git checkout -t origin/maint
> >
> >> OK, now I switched to maint branch. And then I did:
> >> $ git status
> >>
> >> # On branch maint
> >> # Changes to be committed
> >> #    (use "git reset HEAD <file>..." to unstage)
> >> #
> >> #          new file:    git-remote-curl
> >> #          new file:    git-replace
> >> #
> >>
> >> What happened here? What I have to do now?
>
> Why these files has this status? Is supposed to me to do something
> about that when this situation occurs?

I just checked and this is because you probably made a build on the
master branch which creates these files. They are untracked but ignored
through the .gitignore file in the master branch.

Now the situation is that the .gitignore on the current 'maint' branch
does not have these files ignored because they are quite new.

In this situation you can do a

  git clean -f

which gets rid of all untracked but not ignored files (all files that
git status shows as new) or

  make clean

while you are still on the master branch.

cheers Heiko