Problem with case-insensitive file cleanup

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Right now, the gnulib repository is mastered in CVS but mirrored by git (I am still awaiting the day that Jim decides that his hooks are adequate enough that git can be the master and CVS provided by git-cvsserver). Earlier this week, I reported a problem when two case-insensitive files were created, which is a no-no for checkouts on Mac HFS+ or Windows-based platforms [1]. The problem was quickly corrected in CVS (note that _Exit.texi now lives in the attic [2]). But somehow the git repository still thinks that _Exit.texi belongs to the current tree [3], which leads to this confusing state on a case-insensitive clone:

$ git pull Already up-to-date. $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: doc/functions/_Exit.texi # no changes added to commit (use "git add" and/or "git commit -a") $ git reset --hard HEAD HEAD is now at 7464768... Merge branch 'master' of git://git.sv.gnu.org/gnulib $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: doc/functions/_exit.texi # no changes added to commit (use "git add" and/or "git commit -a") $ git reset --hard HEAD HEAD is now at 7464768... Merge branch 'master' of git://git.sv.gnu.org/gnulib $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: doc/functions/_Exit.texi # no changes added to commit (use "git add" and/or "git commit -a")

What needs to happen to get rid of the _Exit.texi listing in the git repository, so that case insensitive file systems can clone the gnulib.git repository?

[1]http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00012.html [2]http://cvs.savannah.gnu.org/viewcvs/gnulib/doc/functions/Attic/_Exit.texi?rev=1.3&root=gnulib&view=log [3]http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=tree;f=doc/functions;hb=a71ea03e4262db77dd90eaf35bad5fee6f79d15e

- --
Don't work too hard, make some time for fun as well!

Eric Blake             ebb9@byu.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGOdpl84KuGfSFAYARAhyEAJ9RFH9anyBa69uksVmG+0XetFJlvgCeNBsf t1ppuGgwxq/kGr0G6qZGV6g= =vS7d -----END PGP SIGNATURE-----