Re: rm and add, but not rename, of identical files

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 10, 2012, 21:47 UTC
Message-ID: <7v1uh6atjl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1349894347.32696.10.camel@drew-northup.unet.maine.edu>

Drew Northup <drew.northup@maine.edu> writes:

Show 21 quoted lines

> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       rc.d/rc2.d/S08iptables
> #       rc.d/rc3.d/S08iptables
> #       rc.d/rc4.d/S08iptables
> ...
> no changes added to commit (use "git add" and/or "git commit -a")
>
> It detects the changes as renames however―which in this case isn't
> appropriate:
>
> [root@drew-northup ~]# etckeeper vcs status
> # On branch master
> # Changes to be committed:
> #   (use "git reset HEAD <file>..." to unstage)
> #
> #       renamed:    rc.d/rc2.d/K92iptables -> rc.d/rc2.d/S08iptables
> #       renamed:    rc.d/rc3.d/K92iptables -> rc.d/rc3.d/S08iptables
> #       renamed:    rc.d/rc4.d/K92iptables -> rc.d/rc4.d/S08iptables
> #...

Given that all of these six files have the same contents, I actually am slightly impressed how well Git matched them up ;-).

But more seriously, why do you have rc.d/rc2.d/S08iptables untracked in the working tree but in the index to be committed?