Fix bogus error message from merge-recursive error path

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index e1aebd77274bb75e9fda95b2d64f69a9dda4276a..3611a2bdb7039f155287f2b706170f76cb6c5c2f 100644 (file)
--- 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);
 }