git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Pitre <nico@cam.org>
To: Sam Vilain <sam@vilain.net>
Cc: Linus Torvalds <torvalds@osdl.org>,
	Carl Worth <cworth@cworth.org>,
	git@vger.kernel.org
Subject: Re: On removing files and "git-rm is pointless"
Date: Sat, 02 Dec 2006 22:50:46 -0500 (EST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0612022246310.2630@xanadu.home> (raw)
In-Reply-To: <4571DB40.6020800@vilain.net>

On Sun, 3 Dec 2006, Sam Vilain wrote:

> Linus Torvalds wrote:
> > I'd like it more if it defaulted to actually removing the file, preferably 
> > refusing to with an error message if the file didn't match the index. 
> 
> index, or HEAD version?  Otherwise you can "update-index"; "rm" without
> seeing something wrong is happening.

Well tough then.

I think what Linus is proposing makes tons of sense.

If you do git rm by mistake then you can always do git checkout on that 
file to get it back.

If you modified it so it doesn't match the index then git rm won't do 
anything by default so you have a chance to think a bit more.

If you updated the index, didn't commit anything but then do git rm then 
you certainly wanted to really rm the file.

If not then just feel the pain of your stupidity and start again from 
the latest version.



  reply	other threads:[~2006-12-03  3:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-02 17:05 On removing files and "git-rm is pointless" Carl Worth
2006-12-02 17:37 ` Linus Torvalds
2006-12-02 20:00   ` Sam Vilain
2006-12-03  3:50     ` Nicolas Pitre [this message]
2006-12-04 10:13       ` Junio C Hamano
2006-12-04 10:48         ` Jakub Narebski
2006-12-04 15:42         ` Linus Torvalds
2006-12-04 16:03           ` Jakub Narebski
2006-12-04 16:04           ` Olivier Galibert
2006-12-05  1:08           ` Junio C Hamano
2006-12-05  3:29             ` Nicolas Pitre
2006-12-05  3:44               ` Carl Worth
2006-12-05  5:43               ` Junio C Hamano
2006-12-02 20:59   ` Horst H. von Brand
2006-12-02 21:10     ` Sam Vilain
2006-12-02 21:33     ` Linus Torvalds

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=Pine.LNX.4.64.0612022246310.2630@xanadu.home \
    --to=nico@cam.org \
    --cc=cworth@cworth.org \
    --cc=git@vger.kernel.org \
    --cc=sam@vilain.net \
    --cc=torvalds@osdl.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).