git rebase likes to fail miserably on Mac OS X Lion

git rebase likes to fail miserably on Mac OS X Lion

[Joshua Jensen]

On 4 different Mac OS X Lion machines, rebasing my commits (I currently 
have 14 of them) yields either of the following _consistently_ across 
varied repositories:

     fatal: Unable to create 
'/Users/joshua/src/project/.git/index.lock': File exists.

or:

     error: Your local changes to the following files would be 
overwritten by merge:

^^^ There are no local changes when the rebase begins.  This is caused 
by the rebase.

I have tried both Git v1.7.5.4 and 1.7.8.4.

I use msysGit for the majority of my Git usage, and I do not run into 
this problem there.

Is there anything to be done?  Right now, the only workaround I can 
think of is to cherry pick changes one at a time as a fake rebase.  Ick.

Thanks.

Josh

Re: git rebase likes to fail miserably on Mac OS X Lion

[Stefan Haller]

Joshua Jensen <jjensen@workspacewhiz.com> wrote:

> On 4 different Mac OS X Lion machines, rebasing my commits (I currently
> have 14 of them) yields either of the following _consistently_ across
> varied repositories:

As far as I can tell, these are two completely unrelated problems.

>      fatal: Unable to create 
> '/Users/joshua/src/project/.git/index.lock': File exists.

In my experience, this is caused by Xcode 4's builtin git support. It
happens when you have your project open in Xcode 4 while you try to
rebase it.  It doesn't seem to be possible to turn off Xcode's git
support (I never use it), so the only workaround seems to be to close
the Xcode project before you rebase.

>      error: Your local changes to the following files would be 
> overwritten by merge:

As a workaround for this one, try

  git config --global core.trustctime false

This helps for me, but I have no idea what the implications are or why
it would be necessary.


(Out of town until Feb 5; don't expect timely replies.)


-- 
Stefan Haller
Berlin, Germany
http://www.haller-berlin.de/