Re: git rebase -i (and gitk) problem in Windows/Cygwin

From: Hannu Koivisto <azure@iki.fi>
Date: Apr 7, 2009, 14:53 UTC
Message-ID: <83ws9wh5w9.fsf@kalahari.s2.org>
In-Reply-To: <alpine.DEB.1.00.0904071624250.6897@intel-tinevez-2-302>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 14 quoted lines

> Hi,
>
> On Tue, 7 Apr 2009, Hannu Koivisto wrote:
>
>> * I change a file in workspace.
>> * I "Update" in gitk - I see the change.
>> * I undo the change.
>> * I "Update" in gitk - I see an empty change.
>> * "Reload" doesn't help - I still se an empty change.
>> * I run "git status" on the command line and then select "Update"
>>   in gitk -> now the change disappears.
>
> What does "git diff" say?  It may be an autocrlf issue or a file mode 
> issue.

It outputs only one line "diff --git a/path/to/file" (where the file is the one I modified and then undid the modification). After I run "git status", it outputs absolutely nothing.

In my gitk problem case I have autocrlf and safecrlf toggled on for the repository and crlf attribute forced for the file in question. It was in this repository I also first saw the rebase problem but when I ran the shown test case, autocrlf and safecrlf were off (they are globally off and I just toggle them on for some repositories).

I remember seeing and reporting a similar "spurious changes in gitk" problem a long time ago and I recall back then Junio came up with some file mode related modification. I haven't seen the problem since until now.

-- 
Hannu