diff options
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rw-r--r-- | read-cache.c | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -128,7 +128,6 @@ static inline unsigned int ce_mode_from_stat(struct cache_entry *ce, unsigned in extern struct cache_entry **active_cache; extern unsigned int active_nr, active_alloc, active_cache_changed; extern struct cache_tree *active_cache_tree; -extern int cache_errno; enum object_type { OBJ_BAD = -1, diff --git a/merge-recursive.c b/merge-recursive.c index e1aebd7727..3611a2bdb7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -221,7 +221,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, struct cache_entry *ce; ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh); if (!ce) - return error("cache_addinfo failed: %s", strerror(cache_errno)); + return error("addinfo_cache failed for path '%s'", path); return add_cache_entry(ce, options); } 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; |