Merge branch 'cherry-pick-segfault'

This branch fixes the problem where merge-recursive's add_cacheinfo()
expected refresh_cache_entry() always to return a valid cache entry (but
it does not do that e.g. when the file in the worktree is modified).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

merge-recursive.c

@@ -235,9 +235,7 @@ 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)
+		if (nce && nce != ce)
 			ret = add_cache_entry(nce, options);
 	}
 	return ret;