X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=unpack-trees.c;h=e30e011cf5c0f75849c848a2d2beb191d0202267;hb=f7231934dc7ec05ec0d13f8d957585c6045b79d6;hp=96c3327f19de4b1060ed43ef291a57a76ff2b8cc;hpb=fd5a92e7391280e6c930a2e60e8ea08bbdc8a378;p=platform%2Fupstream%2Fgit.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 96c3327..e30e011 100644
--- 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;
 }