All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Petr Baudis <pasky@suse.cz>, git@vger.kernel.org
Subject: Re: [PATCH] Fix cg-commit -p to not touch the working tree
Date: Tue, 13 Feb 2007 09:22:12 +1300	[thread overview]
Message-ID: <45D0CC74.9020606@vilain.net> (raw)
In-Reply-To: <7v8xf4atoe.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:
>> 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.

  reply	other threads:[~2007-02-12 20:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-12  3:14 Sam Vilain
2007-02-12  4:25 ` Junio C Hamano
2007-02-12 20:22   ` Sam Vilain [this message]
2007-02-12 22:01     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45D0CC74.9020606@vilain.net \
    --to=sam@vilain.net \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=pasky@suse.cz \
    --subject='Re: [PATCH] Fix cg-commit -p to not touch the working tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.