From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Corrupted git repository?
Date: Wed, 16 Feb 2011 20:21:47 +0100 [thread overview]
Message-ID: <AANLkTimkMSxwkEJGgVrOEOSNFd34DypUQita8n=9jiS0@mail.gmail.com> (raw)
In-Reply-To: <201102161954.26766.j6t@kdbg.org>
On Wed, Feb 16, 2011 at 7:54 PM, Johannes Sixt <j6t@kdbg.org> wrote:
> On Mittwoch, 16. Februar 2011, Piotr Krukowiecki wrote:
>> 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
prev parent reply other threads:[~2011-02-16 19:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-15 14:57 Corrupted git repository? Piotr Krukowiecki
2011-02-15 20:00 ` Junio C Hamano
2011-02-16 16:44 ` Piotr Krukowiecki
2011-02-16 18:54 ` Johannes Sixt
2011-02-16 19:21 ` Piotr Krukowiecki [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTimkMSxwkEJGgVrOEOSNFd34DypUQita8n=9jiS0@mail.gmail.com' \
--to=piotr.krukowiecki@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).