crash mid rebase -- now fatal error

[smichr]

During a rebase, the computer just shut down (like the battery failed even though there was about 50% power left). Now after restarting I cd to sympy and cannot do anything. I get this message whenever I issue any git command:

chriss@CHRIS-LT ~/sympy ((...)|REBASE)

$ git log

fatal: Not a git repository (or any of the parent directories): .git

chriss@CHRIS-LT ~/sympy ((...)|REBASE)

Any ideas of how to remedy this? (The first page of google suggestions for my search have not been fruitful.)

/c

[Aaron Meurer]

Restore from backup, if you have one.

Otherwise, you'll have to figure out what part of the .git directory
got messed up.

If you can't figure it out, and you've pushed everything to GitHub,
you can get a fresh start from there.

Aaron Meurer

> --
> You received this message because you are subscribed to the Google Groups
> "sympy" group.
> To view this discussion on the web visit
> https://groups.google.com/d/msg/sympy/-/AO5pjMv34CsJ.
> To post to this group, send email to sy...@googlegroups.com.
> To unsubscribe from this group, send email to
> sympy+un...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/sympy?hl=en.

[Aaron Meurer]

https://git.wiki.kernel.org/index.php/GitFaq#How_to_fix_a_broken_repository.3F
may also be useful.

Aaron Meurer

[Chris Smith]

On Sun, Jul 15, 2012 at 10:21 AM, Aaron Meurer <asme...@gmail.com> wrote:
> https://git.wiki.kernel.org/index.php/GitFaq#How_to_fix_a_broken_repository.3F
> may also be useful.

mv sympy bad
mkdir sympy
git clone git://github.com/sympy/sympy.git
cd sympy
cp .git/config config_bak
cp ../bad/.git/config .git/config

Then I pulled in all my pushed work. Perhaps I'll see what is
different about the bad sympy repo and the good one, but for now this
got me back on track.

/c

[smichr]

Here is the ticket:

cp .git/ORIG_HEAD  .git/HEAD

rm -f .git/index

git reset

git rebase --abort

(at least that is the best that I've been able to do so far)

[Joachim Durchholz]

Removing the index seems like a good way to kill any git repo.
I'd simply start over with a new clone, copying the working directory
over to salvage any uncommitted work. The unpushed commits would be
gone, not sure how much of a problem that would be.

Regards,
Jo

[smichr]

I also ran into a problem where something happened during a rebase and I couldn't abort the rebase. The solution for this is at http://stackoverflow.com/questions/5104649/how-to-abort-an-interactive-rebase-if-abort-doesnt-work where you have to substitute your branch name for "master" in the solution, so if you are trying to rebase foo and get this problem you fix it with 

git update-ref refs/heads/foo expected_SHA1