From: "Yann Droneaud" <yann@droneaud.fr>
To: "Yann Droneaud" <yann@droneaud.fr>
Cc: fuse-sshfs@lists.sourceforge.net,
fuse-devel@lists.sourceforge.net, git@vger.kernel.org,
yann@droneaud.fr
Subject: Re: inode problem when using git on a sshfs filesystem
Date: Thu, 17 Feb 2011 13:05:58 +0100 [thread overview]
Message-ID: <f0f23bdf3aedabac3a596ef6081009fb.squirrel@webmail.ocsa-data.net> (raw)
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
prev parent reply other threads:[~2011-02-17 12:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 22:04 inode problem when using git on a sshfs filesystem Yann Droneaud
2011-02-17 8:37 ` Michael J Gruber
[not found] ` <1297893854.4097.43.camel-vNW8ozRvgWupuGC+iAP0z+TW4wlIGRCZ@public.gmane.org>
2011-02-17 10:44 ` [sshfs] " Miklos Szeredi
2011-02-17 11:54 ` Yann Droneaud
2011-02-17 13:08 ` Miklos Szeredi
2011-02-17 18:11 ` Yann Droneaud
2011-02-17 19:59 ` Miklos Szeredi
2011-02-18 7:41 ` [fuse-devel] " Goswin von Brederlow
2011-02-17 12:05 ` Yann Droneaud [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=f0f23bdf3aedabac3a596ef6081009fb.squirrel@webmail.ocsa-data.net \
--to=yann@droneaud.fr \
--cc=fuse-devel@lists.sourceforge.net \
--cc=fuse-sshfs@lists.sourceforge.net \
--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.
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).