git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ludvig Strigeus" <strigeus@gmail.com>
To: git@vger.kernel.org
Subject: Git rebase -i failing on cygwin -- git checkout-index says File Exists
Date: Tue, 20 Jan 2009 21:09:23 +0100	[thread overview]
Message-ID: <4285cd450901201209i792195dfmdec1fb14d627b25e@mail.gmail.com> (raw)

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

             reply	other threads:[~2009-01-20 20:10 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-20 20:09 Ludvig Strigeus [this message]
2009-01-20 20:12 ` Git rebase -i failing on cygwin -- git checkout-index says File Exists Ludvig Strigeus
2009-01-20 21:16 ` Johannes Schindelin
2009-01-20 22:20   ` Ludvig Strigeus
2009-01-20 22:44     ` Ludvig Strigeus
2009-01-20 23:23       ` Johannes Schindelin

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=4285cd450901201209i792195dfmdec1fb14d627b25e@mail.gmail.com \
    --to=strigeus@gmail.com \
    --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).