From 0424138d5715dbf8605bacfbd22210aac85a1a8f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 1 Apr 2007 21:13:27 -0700 Subject: 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 --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'read-cache.c') diff --git a/read-cache.c b/read-cache.c index 6339a278da..8a7506d909 100644 --- a/read-cache.c +++ b/read-cache.c @@ -24,7 +24,7 @@ unsigned int active_nr, active_alloc, active_cache_changed; struct cache_tree *active_cache_tree; -int cache_errno; +static int cache_errno; static void *cache_mmap; static size_t cache_mmap_size; -- cgit v1.2.1