X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fread-tree.c;h=9ad1e66916545dd2aeeb110661e56edfa5921019;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=8bdcab11389e8b4facab355f27f0e1926134b86f;hpb=b7ef48d5d5f0d5b912a5ca84a7079803387586ae;p=git.git

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 8bdcab113..9ad1e6691 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -219,14 +219,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	 * "-m ent" or "--reset ent" form), we can obtain a fully
 	 * valid cache-tree because the index must match exactly
 	 * what came from the tree.
-	 *
-	 * The same holds true if we are switching between two trees
-	 * using read-tree -m A B.  The index must match B after that.
 	 */
 	if (nr_trees == 1 && !opts.prefix)
 		prime_cache_tree(&active_cache_tree, trees[0]);
-	else if (nr_trees == 2 && opts.merge)
-		prime_cache_tree(&active_cache_tree, trees[1]);
 
 	if (write_cache(newfd, active_cache, active_nr) ||
 	    commit_locked_index(&lock_file))