Re: Git rebase -i failing on cygwin -- git checkout-index says File Exists

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 20, 2009, 21:16 UTC
Message-ID: <alpine.DEB.1.00.0901202212470.3586@pacific.mpi-cbg.de>
In-Reply-To: <4285cd450901201209i792195dfmdec1fb14d627b25e@mail.gmail.com>

Hi,

On Tue, 20 Jan 2009, Ludvig Strigeus wrote:

Show 12 quoted lines

> I'm having some weird problem with Git on Cygwin on Windows XP. I start 
> with a totally clean repo, and then run interactive rebase to edit a 
> historical commit. I exit the editor without doing anything (I get 
> similar issues if I modify stuff inside the editor).
> 
> $ git st
> # On branch master
> nothing to commit (working directory clean)
> 
> $ git rebase -i 4a1552c81b622f85b0e9170c6fd7a22b4a3e633c
> error: git checkout-index: unable to create file util/stringfuncs.cpp
> (File exists)

This is the error that should stop the whole thing.

Show 5 quoted lines

> fatal: Could not reset index file to revision '4965936'.
> error: Entry 'util/boink-py.cc' not uptodate. Cannot merge.
> fatal: merging of trees 0c27b10e163f00655486976896d096302b0f5c21 and
> 7c7dfd93d678cfc564649738d45260e0b5d9f5a7 failed
> Could not apply d9c7ac9... Various reorganizations.

But here, it should not have continued.

Having said that, I often had that case with interactive rebase, because I had an untracked file lying around (in your case util/stringfuncs.cpp) that was tracked in the version I was trying to rebase onto, but it stopped right there, even on msysGit.

Hopefully you can investigate the scenario more, by "git rebase --abort", and then running the rebase -i again, but with GIT_TRACE=1.

Ciao, Dscho