<div dir="ltr">I think you can keep this one, I think you just need to let git know the rebase is all done (perhaps :recover thinks that's undergoing a rebase since the commit message changed?) <div><br></div><div>Save off your local files to a temp location, then try git rebase --continue like so:</div>
<div><br></div><div>git rebase --continue</div><div><br></div><div>That should give you back additional information about whether git is confused about your changes. Do:</div><div><br></div><div>git status</div><div><br>
</div>
<div>to understand what goes in your patch, then:</div><div><br></div><div>git review -v</div><div><br></div><div>Hopefully that'll get you back on track.</div><div><br></div><div>You could also do: git rebase --skip but your commit message from before might come back. :)</div>
<div><br></div><div>Hope this helps!</div><div>Anne</div><div><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Oct 11, 2013 at 9:16 AM, Kersten J Richter <span dir="ltr"><<a href="mailto:kersten@us.ibm.com" target="_blank">kersten@us.ibm.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>
<p><font face="sans-serif">Hello all,</font><br>
<br>
<font 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 face="sans-serif">The problem child:</font><br>
<br>
<font face="sans-serif"><a href="https://review.openstack.org/#/c/50642/" target="_blank">https://review.openstack.org/#/c/50642/</a></font><br>
<br>
<font 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 face="sans-serif">That gives me this message:</font><br>
</p><ul style="padding-left:18pt"><font face="sans-serif">[kersten@oc6256675768 api-site]$ git review -v</font><br>
<font face="sans-serif">2013-10-10 10:45:11.151413 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font face="sans-serif">2013-10-10 10:45:11.157030 Running: git remote</font><br>
<font face="sans-serif">2013-10-10 10:45:11.161240 Running: git branch -a --color=never</font><br>
<font face="sans-serif">2013-10-10 10:45:11.166604 Running: git branch --color=never</font><br>
<font face="sans-serif">Found topic 'bug/1218235' from parsing changes.</font><br>
<font face="sans-serif">2013-10-10 10:45:11.172235 Running: git rev-parse --git-dir</font><br>
<font face="sans-serif">2013-10-10 10:45:11.177447 Running: git remote update gerrit</font><br>
<font face="sans-serif">Fetching gerrit</font><br>
<font face="sans-serif">From ssh://<a href="http://review.openstack.org:29418/openstack/api-site" target="_blank">review.openstack.org:29418/openstack/api-site</a></font><br>
<font face="sans-serif"> d2fe3f2..cb4f880 master -> gerrit/master</font><br>
<font face="sans-serif">2013-10-10 10:45:14.038075 Running: git rebase -i remotes/gerrit/master</font><br>
<font face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font face="sans-serif">Interactive rebase already started</font></ul>
<br>
<font 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 face="sans-serif">Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: <a href="tel:952-652-5304" value="+19526525304" target="_blank">952-652-5304</a><br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font><p></p></div><br>_______________________________________________<br>
Openstack-docs mailing list<br>
<a href="mailto:Openstack-docs@lists.openstack.org">Openstack-docs@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Anne Gentle<br><a href="mailto:annegentle@justwriteclick.com" target="_blank">annegentle@justwriteclick.com</a>
</div>