This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: GNU C Library master sources branch local_ibm_2.18 created. glibc-2.18-87-g40e9bbd


On Sat, Nov 16, 2013 at 12:46:06AM -0500, Carlos O'Donell wrote:
> On 11/16/2013 12:40 AM, Carlos O'Donell wrote:
> > On 11/16/2013 12:12 AM, Alan Modra wrote:
> >> On Sat, Nov 16, 2013 at 12:01:33AM -0500, Carlos O'Donell wrote:
> >>> Alan,
> >>>
> >>> Did you intend to push the branches local_ibm_2.18 and ibm_2.18 to sourceware?
> >>>
> >>
> >> No, I didn't.  git newb at work here..
> >>
> >> I hit them with
> >> git branch -d -r origin/ibm_2.18
> >> git branch -d -r origin/local_ibm_2.18
> >>
> >> Hopefully that will squash them.  Sorry for the noise.
> > 
> > That's not enough.
> > 
> > That deletes only your local remote-tracking branch.
> > 
> > To kill the branch on the server you need to do this:
> > http://git-scm.com/book/ch3-5.html#Deleting-Remote-Branches
> > 
> > Depending on your version of git you can use:
> > git push origin --delete local_ibm_2.18
> > git push origin --delete ibm_2.18

I tried this with the following result.

git push origin --delete local_ibm_2.18
remote: fatal: Invalid revision range 40e9bbdd3d2ea22c2455949959ced90e054f6023..0000000000000000000000000000000000000000
To ssh://amodra@sourceware.org/git/glibc.git
 - [deleted]         local_ibm_2.18

"git remote update; git branch -r;" then shows the branches gone,
whereas with my previous attempt "git branch -r" showed them gone
initially but after "git remote update", back they came.

> > You can also delete the local branches you have:
> > git branch -D local_ibm_2.18
> > git branch -D ibm_2.18
> > 
> > Then you probably want to follow up with `git remote prune origin'
> > on your end to sync between the upstream deleted branches and your
> > own local tracking branches.
> 
> Alan,
> 
> I forgot we disabled this for safety.

Perhaps I found a bug in the disabling?  :)

Incidentally, all this came about because I following the glibc wiki
on creating branches and used "-b my_local_branch_name".  Then when
trying to push my patches upstream accidentally created a remote
branch.  Curiously I saw an error something like
remote: fatal: Invalid revision range 0000000000000000000000000000000000000000..40e9bbdd3d2ea22c2455949959ced90e054f6023

To compound the problem, I thought maybe I'd created my local branch
wrongly somehow so tried again with a fresh branch.  Hence both
ibm_2.18 and local_ibm_2.18.  (Yes, I know.  Repeating the same thing
and expecting different results.)

I eventually figured out I needed to push using
local_ibm_2.18:refs/heads/ibm/2.18/master.  And I now have a local
branch called ibm/2.18/master so this shouldn't happen again.

Believe it or not, I still like git!

-- 
Alan Modra
Australia Development Lab, IBM


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]