From: Bruno Harbulot <Bruno.Harbulot@manchester.ac.uk>
To: git@vger.kernel.org
Subject: git-svn dcommit gone wrong and git-fsck
Date: Tue, 26 Aug 2008 17:37:36 +0100 [thread overview]
Message-ID: <g91bgi$8cm$1@ger.gmane.org> (raw)
Hello,
I had 11 consecutive commits in my local git repository that I was
trying to commit to an SVN repository, using "git-svn dcommit". The
first 7 worked fine, as usual. However, when sending the 8th, I got a
"Bus error" (on OSX -- I'm not sure what the actual cause was).
A further "git-svn dcommit" produces this error.
Cannot dcommit with a dirty index. Commit your changes first, or stash
them with `git stash'.
at /opt/local/bin/git-svn line 406
In addition, "gitk --all" no longer shows commits 8->11, but the current
files seem to correspond to the last local commit.
I've run git-fsck which shows 3 dangling trees and about a dozen
dangling blobs.
Apologies if it's a FAQ, but I can't seem to find much documentation on
how this can be fixed (if it can). Is there a way to recover the missing
commits and re-attach them back on the branch? (I had pushed that branch
up to the 10th commit into another repository, which could help.)
Thank you,
Bruno.
next reply other threads:[~2008-08-26 16:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-26 16:37 Bruno Harbulot [this message]
2008-08-26 17:36 ` git-svn dcommit gone wrong and git-fsck Björn Steinbrink
2008-08-26 18:01 ` Bruno Harbulot
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='g91bgi$8cm$1@ger.gmane.org' \
--to=bruno.harbulot@manchester.ac.uk \
--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).