aboutsummaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-16 16:23:02 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-17 01:14:43 -0800
commit790fa0e297b41b9e8c98a77b58004c58408e5f7a (patch)
tree6b70cd5b7619edad8b56d1fb5db158c91da0b66e /ident.c
parentb1bfcae438adb485bb66e2f59396373809e346e6 (diff)
downloadgit-790fa0e297b41b9e8c98a77b58004c58408e5f7a.tar.gz
git-790fa0e297b41b9e8c98a77b58004c58408e5f7a.tar.xz
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>
Diffstat (limited to 'ident.c')
0 files changed, 0 insertions, 0 deletions