read-tree -m A B: prime cache-tree from the switched-to tree
When switching to a new branch with "read-tree -m A B", the resulting index must match tree B and we can prime the cache tree with it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 20, 2009 at 03:58 UTC
456156dc068b7664c08e35157e17a6440ec68f32
1 file changed
+5
builtin-read-tree.c
+5
@@ -199,9 +199,14 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
199
* "-m ent" or "--reset ent" form), we can obtain a fully
200
* valid cache-tree because the index must match exactly
201
* what came from the tree.
202
+ *
203
+ * The same holds true if we are switching between two trees
204
+ * using read-tree -m A B. The index must match B after that.
205
*/
206
if (nr_trees == 1 && !opts.prefix)
207
prime_cache_tree(&active_cache_tree, trees[0]);
208
+ else if (nr_trees == 2 && opts.merge)
209
+ prime_cache_tree(&active_cache_tree, trees[1]);
210
211
if (write_cache(newfd, active_cache, active_nr) ||
212
commit_locked_index(&lock_file))