OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
[git-core/git.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index
c07ba0d
..
23d6992
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);
}