Re: [PATCH] git-rm: don't remove newly added file without -f

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 26, 2007, 21:17 UTC
Message-ID: <Pine.LNX.4.63.0703262314090.4045@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v1wjbwvzl.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 26 Mar 2007, Junio C Hamano wrote:

Show 16 quoted lines

> Jeff King <peff@peff.net> writes:
> 
> > Given this set of commands:
> >
> >   $ echo "newly added file" >new
> >   $ git add new
> >   $ git rm new
> >
> > the file "new" was previously removed from the working
> > directory and the index. Because it was not in HEAD, it is
> > available only by searching for unreachable objects.
> 
> I am not sure if this is a problem, as the user asked it to be
> removed.  It somehow feels to me that the change (I am not
> convinced your patch should be called a "fix" rather than a
> "behaviour change") would cause more confusion.

I agree it would add to confusion.

It is well established that "git rm" also removes the file _in the working directory_.

If you don't want the file to be deleted, but only the corresponding entry _in the index_, use "git rm --cached".

Ciao, Dscho