Re: [PATCH] checkout -f: do not leave untracked working tree files.

From: Junio C Hamano <junkio@cox.net>
Date: Jun 20, 2006, 11:18 UTC
Message-ID: <7vfyi09isf.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <8764iw5bvl.fsf@gmail.com>

Santi Béjar <sbejar@gmail.com> writes:

> Another thing to take into account is that, for this particular
> case/sequence, the untracked file-F is exactly the same as the one from
> the pull, so you are not overwritting that file and it could succeed.

Yes and no. The untracked file is not even known to git when pull is happening (that is the definition of "untracked"). Yes, we could see if the contents happen to match and choose to overwrite, but I think it is often more likely that the contents do not match that it is not worth it (I have not examined what it would involve to add that check yet, so it might turn out to be a cheap check but I doubt it).