mingw: sh arguments need quoting in more circumstances

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

diff --git a/unpack-trees.c b/unpack-trees.c
index 3563daae1aa6bceb4f7a4715ee574e1359622239..725351b287c1e83fbb5b4470cf54b881b9f5d41b 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -2072,7 +2072,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;
 }