Code

Fix bogus error message from merge-recursive error path
authorJunio C Hamano <junkio@cox.net>
Mon, 2 Apr 2007 04:13:27 +0000 (21:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 Apr 2007 22:07:16 +0000 (15:07 -0700)
commit0424138d5715dbf8605bacfbd22210aac85a1a8f
treed3e540a33cad4074ceb50f04e8b5a2b3bb6c5fc8
parentb18825876ae60e67e646097945c8365779175ee2
Fix bogus error message from merge-recursive error path

This error message should not usually trigger, but the function
make_cache_entry() called by add_cacheinfo() can return early
without calling into refresh_cache_entry() that sets cache_errno.

Also the error message had a wrong function name reported, and
it did not say anything about which path failed either.

Signed-off-by: Junio C Hamano <junkio@cox.net>
cache.h
merge-recursive.c
read-cache.c