From: Steffen Prohaska <prohaska@zib.de>
Date: Mon, 13 Aug 2007 17:41:24 GMT
Subject: Re: msysgit: merge, stat
Message-ID: <23ED0751-B872-46E0-A6F5-2C0A72C4EA53@zib.de>
In-Reply-To: <Pine.LNX.4.64.0708131743360.25989@racer.site>


On Aug 13, 2007, at 6:45 PM, Johannes Schindelin wrote:

> Hi,
>
> On Sun, 12 Aug 2007, Steffen Prohaska wrote:
>
>> After a 'git merge' in msysgit some stat information of the index
>> doesn't match the working tree. Thus 'git diff' looks at files,
>> which it shouldn't look at. I need to do a
>> 'git update-index --refresh' before everything's in sync.
>>
>> Is this a know issue? Do other experience the same?
>
> Yes, it is.  The real issue is that the index is out of date, and  
> the full
> speed of git is not available until a refresh (which you can have  
> with a
> "git status", too).
>
> There are people who want to change the behaviour, and hide the  
> empty diff
> output, preventing the user from ever knowing why git is so slow.
>
> So just run a "git status" and continue.

Could we add 'git update-index --refresh' after a successful merge,
or would it slow things down. I'm not that much concerned about
the empty diff, but if I start gitk it also finds local changes,
which are not real, and this is always a bit distracting.

	Steffen