From: Junio C Hamano <junkio@cox.net>
Date: Sat, 16 Dec 2006 19:23:52 GMT
Subject: Re: git-add fails after file type change
Message-ID: <7vmz5nejav.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <458437E0.1050501@midwinter.com>

Steven Grimm <koreth@midwinter.com> writes:

> $ mkdir dir
> $ echo foo > dir/file
> $ git add .
> ...
> Committing initial tree f4bc9c50d08b041f5e096fa68e243c34170f1cd8
> create mode 100644 dir/file
> $ mv dir dir.real
> $ ln -s dir.real dir
> $ git add .
> fatal: unable to add dir to index

You didn't tell the index to remove dir/file.  You cannot have
dir and dir/file at the same time.