Sync with 2.16.6

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index e73745051e505934b44be216b1d80a6c053c96de..88a0b5d250ef1da36747fe0b736df4305979977d 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,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;
 }