Re: msysgit: merge, stat

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux