diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-01 21:13:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 15:07:16 -0700 |
| commit | 0424138d5715dbf8605bacfbd22210aac85a1a8f (patch) | |
| tree | d3e540a33cad4074ceb50f04e8b5a2b3bb6c5fc8 /read-cache.c | |
| parent | b18825876ae60e67e646097945c8365779175ee2 (diff) | |
| download | git-0424138d5715dbf8605bacfbd22210aac85a1a8f.tar.gz git-0424138d5715dbf8605bacfbd22210aac85a1a8f.tar.xz | |
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>
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index 6339a278d..8a7506d90 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; |