git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: On removing files and "git-rm is pointless"
Date: Mon, 04 Dec 2006 11:48:42 +0100	[thread overview]
Message-ID: <el0uaf$n7h$1@sea.gmane.org> (raw)
In-Reply-To: 7vd570q888.fsf@assigned-by-dhcp.cox.net

Junio C Hamano wrote:

> Nicolas Pitre <nico@cam.org> writes:
> 
>> 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.
> 
> FWIW, I too am in favor of the proposed fix to "git rm" as Linus
> outlined.

+1. I'm also for this change. Of course if the working area version doesn't
match HEAD version git-rm should remove only index entry, and print warning
message, for example what it does now, i.e.
  rm '<filename>'
or if we want more chatty version (core.gitgor = true) it would print:
  File '<filename>' changed. Use "rm '<filename>'" to remove.
(or something like that).

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git


  reply	other threads:[~2006-12-04 10:46 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
2006-12-04 10:13       ` Junio C Hamano
2006-12-04 10:48         ` Jakub Narebski [this message]
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='el0uaf$n7h$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.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).