Trying to import an existing git repository into SVN per this answer; went smoothly for a couple of commits, but then I hit a failed precommit hook.
r180827 = 444fa1c75e5a31fe8d887637a7fbd3fc62b34354 (refs/remotes/trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
Unstaged changes after reset:
M [some file]
M [another file]
M [...etc...]
A [problem file]
A repository hook failed: 'pre-commit' hook failed with error output:
[error description]
at /usr/libexec/git-core/git-svn line 922
I fixed the hook so I could get past it; but when I tried just git svn dcommit
again (clearly wrong), I got
[some file]: needs update
[another file]: needs update
[...etc...]
When I do 'git status', I get:
# modified: [some file]
# modified: [another file]
# modified: [...etc...]
#
# Untracked files:
# (use "git add<file>..." to include in what will be committed
#
# [problem file]
# [other file modified in the commit that created the problem file]
# [yet other files modified in that commit]
# [...etc...]
I suppose I could blow the whole SVN tree away and start over, but I'd really rather not. How do I recover from this and continue the dcommit?