Re: Re: [PATCH] optionally disable overwriting of ignored files

From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Aug 31, 2010, 18:44 UTC
Message-ID: <20100831184410.GA29001@book.hvoigt.net>
In-Reply-To: <vpqaaod7mpa.fsf@bauges.imag.fr>

On Mon, Aug 23, 2010 at 10:33:21AM +0200, Matthieu Moy wrote:

Show 11 quoted lines

> Clemens Buchacher <drizzd@aon.at> writes:
> 
> > By default, checkout and fast-forward merge will overwrite ignored
> > files. Make this behavior configurable.
> 
> I'd use this option if it gets into git.git.
> 
> I didn't follow the discussions when the feature was added, and I was
> basically not aware that Git could trash my ignored files this way.
> I've always thought that Git took great care not to touch untracked
> files, and I found this good ...

I agree here. I would like to have this as an option as well. And I think adding a "ignored but precious" category does not make sense in practise. My guess is that a user would only know _after_ git trashed some precious file that it belongs into that category;) I have told my users that git is very careful with their files and I would like to keep this promise.

I was actually never annoyed by a failed checkout because of an untracked file in the way. (A 'git clean -fx' always fixes this).

Thanks.

Heiko