update-index: make D/F conflict error a bit more verbose.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 00:23:02 +0000 (16:23 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:14:43 +0000 (01:14 -0800)
When you remove a directory D that has a tracked file D/F out of the
way to create a file D and try to "git update-index --add D", it used
to say "cannot add" which was not very helpful. This issues an extra
error message to explain the situation before the final "fatal" message.

Since D/F conflicts are relatively rare event, extra verbosity would
not make things too noisy.

Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found