<html><body>
<p><font size="2" face="sans-serif">Hello all,</font><br>
<br>
<font size="2" face="sans-serif">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:</font><br>
<br>
<font size="2" face="sans-serif">The problem child:</font><br>
<br>
<font size="2" face="sans-serif"><a href="https://review.openstack.org/#/c/50642/">https://review.openstack.org/#/c/50642/</a></font><br>
<br>
<font size="2" face="sans-serif">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.</font><br>
<br>
<font size="2" face="sans-serif">That gives me this message:</font><br>
<ul style="padding-left: 18pt"><font size="2" face="sans-serif">[kersten@oc6256675768 api-site]$ git review -v</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.151413 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.157030 Running: git remote</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.161240 Running: git branch -a --color=never</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.166604 Running: git branch --color=never</font><br>
<font size="2" face="sans-serif">Found topic 'bug/1218235' from parsing changes.</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.172235 Running: git rev-parse --git-dir</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:11.177447 Running: git remote update gerrit</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">From ssh://review.openstack.org:29418/openstack/api-site</font><br>
<font size="2" face="sans-serif"> d2fe3f2..cb4f880 master -> gerrit/master</font><br>
<font size="2" face="sans-serif">2013-10-10 10:45:14.038075 Running: git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Interactive rebase already started</font></ul>
<br>
<font size="2" face="sans-serif">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?</font><br>
<br>
<br>
<br>
<br>
<font size="2" face="sans-serif">Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: 952-652-5304<br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font></body></html>