git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Teemu Likonen <tlikonen@iki.fi>
To: Jens Neuhalfen <JensNeuhalfen@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: git svn dcommit crashed -- how do I resume?
Date: Wed, 26 Nov 2008 11:42:11 +0200	[thread overview]
Message-ID: <87k5aqlt70.fsf@iki.fi> (raw)
In-Reply-To: <E8293DEF-109A-4F57-BD4F-7F189976DA79@gmx.de> (Jens Neuhalfen's message of "Wed\, 26 Nov 2008 09\:22\:36 +0100")

Jens Neuhalfen (2008-11-26 09:22 +0100) wrote:

> I am using git as a frontend to my SVN-Repository. When I tried to
> "git svn dcommit" several changes from my local git-repository, git
> crashed (SEGFAULT, AFAIR).

> I am confused (an slightly panicked), because my old commits seem to
> be "gone", my WC does not contain the most recent files and there
> seems to be no "backup-branch" with my old HEAD.

I don't know why the the dcommit crashed but I'm certain that you can
find your previous commits through the reflog. Try (one of) these
commands:

    git log --walk-reflogs [branchname]
    git log --walk-reflogs HEAD

They will show a list of commits about where [branchname] or HEAD has
been previously in _your_ repository. If/when you find the correct
commit (where you think the branch's head should be) copy its SHA1 and
create a new branch from it (git branch new-branch [SHA1]) - or just
reset the broken branch to that commit (git reset --hard [SHA1]).

      reply	other threads:[~2008-11-26  9:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-26  8:22 git svn dcommit crashed -- how do I resume? Jens Neuhalfen
2008-11-26  9:42 ` Teemu Likonen [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k5aqlt70.fsf@iki.fi \
    --to=tlikonen@iki.fi \
    --cc=JensNeuhalfen@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).