Re: "git-checkout-cache -f -a" failure

From: Petr Baudis <pasky@ucw.cz>
Date: May 10, 2005, 23:03 UTC
Message-ID: <20050510230357.GF26384@pasky.ji.cz>
In-Reply-To: <7vr7gewuxt.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Wed, May 11, 2005 at 12:57:34AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> told me that...

Show 14 quoted lines

> >>>>> "MW" == Morten Welinder <mwelinder@gmail.com> writes:
> 
> MW> git-checkout-cache is having problems when files change from directories to
> MW> plain files or vice versa.  cg-seek seems to be similarly affected.
> 
> Could you give this patch a try?  It lets checkout-cache remove
> a file where you want to have a directory (because you want to
> create something underneath) or remove a whole subdirectory
> where you want to have a non-directory, when '-f' parameter is
> specified.
> 
> If things test well, I'll put this in the git-jc repository and
> ask Linus to pull from it alongside with other accumulated
> patches when he returns.

Chilling.

What if you have some files not tracked by git in the subdirectory? Either you need to check for this and deal with it (Cogito's approach would be to remove the git-tracked files and rename the subdirectory), or not do it at all. Or at least please use -F or something if you really want this and like to gamble.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor