| commit | 790fa0e297b41b9e8c98a77b58004c58408e5f7a | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 00:23:02 +0000 (16 16:23 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 09:14:43 +0000 (17 01:14 -0800) | ||
| tree | 6b70cd5b7619edad8b56d1fb5db158c91da0b66e | treesnapshot (tar.gz zip) |
| parent | b1bfcae438adb485bb66e2f59396373809e346e6 | commitdiff |
update-index: make D/F conflict error a bit more verbose.
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>
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>
| read-cache.c | diffblobblamehistory |