Open Stack

On 10/11/2013 04:16 PM, Kersten J Richter wrote:
> 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:

Please do not reply to other emails and change subject, start a fresh
thread directly.

> 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?

The WebUI has a button "Abandon Change" that you can press any time -
and then start with a clean git branch.

The following worked just fine for me:
git checkout master
git pull
git review -d 50642
git commit --amend
git review

Please have a look a the updated patch, I hope it's ok now. If not, give
it again a try,

Andreas
-- 
 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126