git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Ludvig Strigeus <strigeus@gmail.com>
Date
Jan 20, 2009, 20:09 UTC
Message-ID
<4285cd450901201209i792195dfmdec1fb14d627b25e@mail.gmail.com>
Hi,

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) 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.

Any clues?

Thanks, Ludde

Next: Ludvig Strigeus
Message 1 of 6 in “Git rebase -i failing on cygwin -- git checkout-index says File Exists”
  1. Ludvig StrigeusJan 20, 2009
  2. Ludvig StrigeusJan 20, 2009
  3. Johannes SchindelinJan 20, 2009
  4. Ludvig StrigeusJan 20, 2009
  5. Ludvig StrigeusJan 20, 2009
  6. Johannes SchindelinJan 20, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.