Imported Upstream version 2.15.4

[platform/upstream/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 71b70cc..26028b7 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1809,7 +1809,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;
 }