{"thread":{"id":"16471","subject":"git svn dcommit crashed -- how do I resume?","startedAt":"2008-11-26T08:22:36Z","lastAt":"2008-11-26T09:42:11Z","messageCount":2,"participants":["Jens Neuhalfen","Teemu Likonen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96522","messageId":"E8293DEF-109A-4F57-BD4F-7F189976DA79@gmx.de","threadId":"16471","inReplyTo":null,"subject":"git svn dcommit crashed -- how do I resume?","fromName":"Jens Neuhalfen","fromEmail":"jensneuhalfen@gmx.de","sentAt":"2008-11-26T08:22:36Z","receivedAt":"2008-11-26T08:22:36Z","isPatch":false,"sender":{"key":"jensneuhalfen@gmx.de","avatar":null},"body":"Hi,\n\nI am using git as a frontend to my SVN-Repository. When I tried to  \n\"git svn dcommit\" several changes from my local git-repository, git  \ncrashed (SEGFAULT, AFAIR).\n\nNow I have a working copy (master branch) that points \"somewhere in  \nthe past\" (at least my files are old). I have a git-svn remote branch  \nthat points to the same SHA1.\n\n$ git branch -a\n   dokument-zusammenfuehren\n* master\n   git-svn\n\nI cannot dcommit\n$ git svn dcommit\nCannot dcommit with a dirty index.  Commit your changes first, or  \nstash them with `git stash'.\n  at /Users/jens/libexec/git-core/git-svn line 415\n\nAnd, indeed, the index is dirty.\n\n\nI am confused (an slightly panicked), because my old commits seem to  \nbe \"gone\", my WC does not contain the most recent files and there  \nseems to be no \"backup-branch\" with my old HEAD.\n\nAny idea, how I might get my data back and how to 'resume' the dead  \ndcommit? Google did not turn up anything usefull, unfortunally.\n\n\nBTW: I am currently using git version 1.6.0.rc0.24.gf45e0.dirty.\n\n\nJens\n"},{"id":"96528","messageId":"87k5aqlt70.fsf@iki.fi","threadId":"16471","inReplyTo":"E8293DEF-109A-4F57-BD4F-7F189976DA79@gmx.de","subject":"Re: git svn dcommit crashed -- how do I resume?","fromName":"Teemu Likonen","fromEmail":"tlikonen@iki.fi","sentAt":"2008-11-26T09:42:11Z","receivedAt":"2008-11-26T09:42:11Z","isPatch":false,"sender":{"key":"tlikonen@iki.fi","avatar":null},"body":"Jens Neuhalfen (2008-11-26 09:22 +0100) wrote:\n\n> I am using git as a frontend to my SVN-Repository. When I tried to\n> \"git svn dcommit\" several changes from my local git-repository, git\n> crashed (SEGFAULT, AFAIR).\n\n> I am confused (an slightly panicked), because my old commits seem to\n> be \"gone\", my WC does not contain the most recent files and there\n> seems to be no \"backup-branch\" with my old HEAD.\n\nI don't know why the the dcommit crashed but I'm certain that you can\nfind your previous commits through the reflog. Try (one of) these\ncommands:\n\n    git log --walk-reflogs [branchname]\n    git log --walk-reflogs HEAD\n\nThey will show a list of commits about where [branchname] or HEAD has\nbeen previously in _your_ repository. If/when you find the correct\ncommit (where you think the branch's head should be) copy its SHA1 and\ncreate a new branch from it (git branch new-branch [SHA1]) - or just\nreset the broken branch to that commit (git reset --hard [SHA1]).\n"}]}