From: Petr Baudis <pasky@ucw.cz>
Date: Thu, 14 Apr 2005 23:07:12 GMT
Subject: Re: Re: [patch pasky] update gitcancel.sh to handle modes as well
Message-ID: <20050414230712.GT22699@pasky.ji.cz>
In-Reply-To: <1113519890.23299.129.camel@nosferatu.lan>

Dear diary, on Fri, Apr 15, 2005 at 01:04:50AM CEST, I got a letter
where Martin Schlemmer <azarah@nosferatu.za.org> told me that...
> Rather use checkout-cache to sync our tree, as should do the right thing
> instead of diffing (cancel imply just blow away everything).
> 
> Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
> 
> gitcancel.sh:  839b3c58f20f6eb8412f499a891e007e2e67d114
> --- 839b3c58f20f6eb8412f499a891e007e2e67d114/gitcancel.sh
> +++ uncommitted/gitcancel.sh
> @@ -10,9 +10,8 @@
>  #
>  # Takes no arguments. Takes the evil changes from the tree.
> 
> -# FIXME: Does not revert mode changes!
> 
> -show-diff | patch -p0 -R
>  rm -f .git/add-queue .git/rm-queue
> +checkout-cache -q -f -a
> 
>  update-cache --refresh

Why -q?

Never make things silent unless you really know what are you doing and
why. The same goes for popular throwing of -f to rm's of files which
should always exist or 2>/dev/null for cats.

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