From: Yann Droneaud <yann@droneaud.fr>
Date: Thu, 17 Feb 2011 12:05:58 GMT
Subject: Re: inode problem when using git on a sshfs filesystem
Message-ID: <f0f23bdf3aedabac3a596ef6081009fb.squirrel@webmail.ocsa-data.net>
In-Reply-To: <1297893854.4097.43.camel@dworkin.quest-ce.net>

> Hi,
>
> For some days, my usage of git is not as seamless as before.
>
> I'm using git along sshfs/fuse (don't blame me for that), and
> each time I try to rebase one of my branch, I have a conflict when
> applying
> the third commit. Doing the same operation on a local filesystem works
> without any problem.
>
> ===== Part one: git =====
>
> When I try to rebase one specific branch, git rebase failed when applying
> the third commit,
> telling me about uncommited
>

For the record, here's the exact message for a rebase:

$ git rebase origin
First, rewinding head to replay your work on top of it...
Applying: patch1
Applying: patch2
Applying: patch3
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to '<path>/<filename>' would be overwritten by
merge.  Aborting.
Please, commit your changes or stash them before you can merge.
Failed to merge in the changes.
Patch failed at 0003 patch3


> As a workaround: running git diff / git diff --cached / git status between
> each
> git apply --index command seems to update the cache and allows me to apply
> all the patches
> without problem. But it's not an easy path to follow when rebasing
> branches.
>

The exact command to update the index is "git diff".

Regards.

-- 
Yann Droneaud