X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-read-tree.c;h=0138f5a9172034b2ce34222ff077a975f8998005;hb=cf7f929a10f141d319d47c68646c88d5911de777;hp=c0ea0342b755c6749391803d19f852182c0c512e;hpb=a41acc63badf20cbb22cca61039dca9309deaa19;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index c0ea0342b..0138f5a91 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -41,12 +41,12 @@ static int read_cache_unmerged(void)
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
 		if (ce_stage(ce)) {
+			remove_index_entry(ce);
 			if (last && !strcmp(ce->name, last->name))
 				continue;
 			cache_tree_invalidate_path(active_cache_tree, ce->name);
 			last = ce;
-			ce->ce_mode = 0;
-			ce->ce_flags &= ~htons(CE_STAGEMASK);
+			continue;
 		}
 		*dst++ = ce;
 	}
@@ -269,7 +269,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 		parse_tree(tree);
 		init_tree_desc(t+i, tree->buffer, tree->size);
 	}
-	unpack_trees(nr_trees, t, &opts);
+	if (unpack_trees(nr_trees, t, &opts))
+		return 128;
 
 	/*
 	 * When reading only one tree (either the most basic form,