Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index e64b48b25da2a53851aa40cf149e510641c23a8d..214f5a693bbbfdc5a6da5727dbad7830f83748dd 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -235,6 +235,8 @@ static int add_cacheinfo(struct merge_options *o,
                struct cache_entry *nce;
 
                nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
+               if (!nce)
+                       return err(o, _("addinfo_cache failed for path '%s'"), path);
                if (nce != ce)
                        ret = add_cache_entry(nce, options);
        }