search

gmzang / maczfs

Automatically exported from code.google.com/p/maczfs
Other
0 stars 0 forks source link

File has been changed/git working tree is dirty during a rebase #31

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
If you have a Git repository on a Mac OSX ZFS partition, and then attempt to do 
a rebase, you 
get a 'working tree is dirty' error, even when it's clean:

apple:test alex$ git status
# On branch master
nothing to commit (working directory clean)
apple:test alex$ git rebase -i a6c37f4ea9881897650504756a61556015978b96
Working tree is dirty

I have also seen problems with Eclipse and XCode thinking the file has changed 
on the file 
system (when it hasn't). 

It transpires that you can do this:

apple:test alex$ git config --global core.trustctime false
apple:test alex$ git rebase -i a6c37f4ea9881897650504756a61556015978b96
Successfully rebased and updated refs/heads/master.

So there's obviously some kind of bug/inconsistency with the 'ctime' of the 
file which is causing 
this behaviour. It may be related to the stat/stat64 issue inconsistency.

Original issue reported on code.google.com by alex.ble...@gmail.com on 20 Feb 2010 at 7:23