[Qemu-devel] Branch/tag renames in git

[Qemu-devel] Branch/tag renames in git

[Anthony Liguori]

Hi,

Based on the previous discussion, I've renamed the branches tags in 
git.  It doesn't look like a git pull automatically cleans up the old 
branches/tags which is somewhat unfortunate.

The new tags are in the form v0.10.3.  The new stable branch is in the 
form stable-0.10.

You may have to update your local branches to track the appropriate 
remote branch if you've been following stable.

-- 
Regards,

Anthony Liguori

Re: [Qemu-devel] Branch/tag renames in git

[François Revol]

> Hi,
>
> Based on the previous discussion, I've renamed the branches tags in
> git.  It doesn't look like a git pull automatically cleans up the old
> branches/tags which is somewhat unfortunate.
>
> The new tags are in the form v0.10.3.  The new stable branch is in
> the
> form stable-0.10.

Ah... so that's why I now get
$ git pull
error: no such remote ref refs/heads/stable_0_10
Fetch failure: git://git.savannah.nongnu.org/qemu.git

?

Why would it want to care about this branch anyway, I just want HEAD...

>
> You may have to update your local branches to track the appropriate
> remote branch if you've been following stable.
>

And how would one do this, I've been reading git man pages for 2h now
and I'm out of aspirin ;)

François.

Re: [Qemu-devel] Branch/tag renames in git

[François Revol]

> > Hi,
> >
> > Based on the previous discussion, I've renamed the branches tags in
> > git.  It doesn't look like a git pull automatically cleans up the
> > old
> > branches/tags which is somewhat unfortunate.
> >
> > The new tags are in the form v0.10.3.  The new stable branch is in
> > the
> > form stable-0.10.
>
> Ah... so that's why I now get
> $ git pull
> error: no such remote ref refs/heads/stable_0_10
> Fetch failure: git://git.savannah.nongnu.org/qemu.git

According to
http://www.gelato.unsw.edu.au/archives/git/0612/35149.html

one should
vi .git/remotes/origin
and delete the line talking about stable_0_10

Damn, I'm now replying to myself, this is incoGITable.

François.

Re: [Qemu-devel] Branch/tag renames in git

[Anthony Liguori]

François Revol wrote:
>> Hi,
>>
>> Based on the previous discussion, I've renamed the branches tags in 
>> git.  It doesn't look like a git pull automatically cleans up the old 
>> branches/tags which is somewhat unfortunate.
>>
>> The new tags are in the form v0.10.3.  The new stable branch is in 
>> the 
>> form stable-0.10.
>>     
>
> Ah... so that's why I now get
> $ git pull
> error: no such remote ref refs/heads/stable_0_10
> Fetch failure: git://git.savannah.nongnu.org/qemu.git
>
> ?
>   

git config branch.stable_0_10.merge refs/heads/stable-0.10

Assuming you have a local branch.  I can't see why you'd have an issue 
if you didn't have a local branch tracking the remote branch.

-- 
Regards,

Anthony Liguori

Re: [Qemu-devel] Branch/tag renames in git

[François Revol]

> François Revol wrote:
> >> Hi,
> >>
> >> Based on the previous discussion, I've renamed the branches tags
> > > in
> >> git.  It doesn't look like a git pull automatically cleans up the
> > > old
> >> branches/tags which is somewhat unfortunate.
> >>
> >> The new tags are in the form v0.10.3.  The new stable branch is in
> >> the
> >> form stable-0.10.
> >>
> >
> > Ah... so that's why I now get
> > $ git pull
> > error: no such remote ref refs/heads/stable_0_10
> > Fetch failure: git://git.savannah.nongnu.org/qemu.git
> >
> > ?
> >
>
> git config branch.stable_0_10.merge refs/heads/stable-0.10
>
> Assuming you have a local branch.  I can't see why you'd have an
> issue

Assuming you have git-config too...
maybe it's just too old but again, ENOSPC.

> if you didn't have a local branch tracking the remote branch.

error: forward reference: local branch
I shall read about it first.


François.

Re: [Qemu-devel] Branch/tag renames in git

[Johannes Schindelin]

Hi,

On Tue, 28 Apr 2009, Anthony Liguori wrote:

> Based on the previous discussion, I've renamed the branches tags in git.  
> It doesn't look like a git pull automatically cleans up the old 
> branches/tags which is somewhat unfortunate.

Git complaints should be sent to git@vger.kernel.org, not hidden in some 
mailing list only one Git developer reads (and that only when time 
permits).

If you hide something, do not expect people who should know to find them.

Ciao,
Dscho

Re: [Qemu-devel] Branch/tag renames in git

[François Revol]

> Hi,
>
> On Tue, 28 Apr 2009, Anthony Liguori wrote:
>
> > Based on the previous discussion, I've renamed the branches tags in
> > git.
> > It doesn't look like a git pull automatically cleans up the old
> > branches/tags which is somewhat unfortunate.
>
> Git complaints should be sent to git@vger.kernel.org, not hidden in
> some
> mailing list only one Git developer reads (and that only when time
> permits).

You can even send them a patch, if you get it to work...
:^)

François.