projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.16.6
[platform/upstream/git.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index
96c3327
..
e30e011
100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-1811,7
+1811,8
@@
static int merged_entry(const struct cache_entry *ce,
invalidate_ce_path(old, o);
}
- do_add_entry(o, merge, update, CE_STAGEMASK);
+ if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
+ return -1;
return 1;
}