Open Stack

Hello all,

I screwed something up and can't get back out of it.  Basically, I made a
hash of the commit message.  My attempts to fix have led me farther and
further down the rabbit hole.  Here is where I'm at now:

The problem child:

https://review.openstack.org/#/c/50642/

I ran git review -d 50642 and got the branch back.   I then ran git commit
-a --amend and received a warning that I had two copies of the commit
message.  So I used :recover and got the correct one back.  I verified that
it looked fine in vi (has a much better header than my name and date!).
Closed out of vi and ran git review -v.

That gives me this message:

   [kersten at oc6256675768 api-site]$ git review -v
   2013-10-10 10:45:11.151413 Running: git log --color=never --oneline
   HEAD^1..HEAD
   2013-10-10 10:45:11.157030 Running: git remote
   2013-10-10 10:45:11.161240 Running: git branch -a --color=never
   2013-10-10 10:45:11.166604 Running: git branch --color=never
   Found topic 'bug/1218235' from parsing changes.
   2013-10-10 10:45:11.172235 Running: git rev-parse --git-dir
   2013-10-10 10:45:11.177447 Running: git remote update gerrit
   Fetching gerrit
   From ssh://review.openstack.org:29418/openstack/api-site
      d2fe3f2..cb4f880  master     -> gerrit/master
   2013-10-10 10:45:14.038075 Running: git rebase -i remotes/gerrit/master
   Errors running git rebase -i remotes/gerrit/master
   Interactive rebase already started

What do I do now?  Obviously something is wrong somewhere but I don't know
what.  Can I just kill the review and redo it?




Kersten J. Richter
Software Engineer
IBM, Rochester
Home office: 952-652-5304

If you lend someone $20 and never see that person again, it was probably
worth it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20131011/239d9d34/attachment.html>