Re: [PATCH] Fix cg-commit -p to not touch the working tree

From: Sam Vilain <sam@vilain.net>
Date: Feb 12, 2007, 20:22 UTC
Message-ID: <45D0CC74.9020606@vilain.net>
In-Reply-To: <7v8xf4atoe.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

Show 12 quoted lines

>> Previously, the working tree state was modified with `patch', which
>> was a fragile operation.  Do everything with `git-apply --cached
>> --index' instead.
>>     
> I do not use Cogito so I do not know what behaviour is wanted
> here, but '--cached --index' is same as saying just '--cached'
> as far as I know.  It will patch against the index and should
> not touch working tree.  If the original used 'patch' to apply,
> I suspect it wanted to touch the working tree (and possibly, it
> wanted to leave the index alone?), so --cached might be
> completely wrong thing to use here?
>

The context is that "cg-commit -p", a kind of poor man's interactive commit that lets you preview changes that are to be committed in 'diff' form, and edit the patch to be applied. Many users expect this command to behave this way; they're quite surprised and sometimes even miffed when the changes they deleted from the patch are gone from their working copy.

Sam.