Re: Corrupted git repository?

On Wed, Feb 16, 2011 at 7:54 PM, Johannes Sixt [off-list ref] wrote:

On Mittwoch, 16. Februar 2011, Piotr Krukowiecki wrote:

quoted

I have deleted the whole top-level directory in which the file was and run:

$ git status | grep  <<PATH>>
#     deleted:    <<PATH>>

$ git checkout -- <<top dir>>

$ git status
# On branch master
nothing to commit (working directory clean)

$ git cherry-pick 7d193bb0c1f14908361d9d9d5e30f0c12d5f2c2f
error: Your local changes to the following files would be overwritten by
merge: <<PATH>>
Please, commit your changes or stash them before you can merge.
Aborting

A wild guess: You are on Windows or OS/X, and the file exists in your worktree
with different uppercase/lowercase name? Rename the file so that its case is
the same as it is recorded in the repository.

Nope, I'm on linux with case-sensitive file system.

Some commits to svn repository are coming from windows. But the cherry-picked
one was my commit from linux. It was first done in git, then dcomitted
to svn and
then I tried to merge it to git branch - that failed.


-- 
Piotrek