@matheusbsbs / matheus-bagliano / commits / b266b123cd
Fork 0

Fix earlier mismerges.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jun 4, 2006 at 00:10 UTC b266b123cd3124497a1d006cb126033ce458a85c
1 file changed +2 -4
builtin-read-tree.c
+2 -4
@@ -799,10 +799,8 @@ static int oneway_merge(struct cache_entry **src)
799 return error("Cannot do a oneway merge of %d trees",
800 merge_size);
801
802 - if (!a) {
803 - invalidate_ce_path(old);
802 + if (!a)
803 return deleted_entry(old, old);
805 - }
804 if (old && same(old, a)) {
805 if (reset) {
806 struct stat st;
@@ -1034,7 +1032,7 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
1032 * valid cache-tree because the index must match exactly
1033 * what came from the tree.
1034 */
1037 - if (trees && trees->item && (!merge || (stage == 2))) {
1035 + if (trees && trees->item && !prefix && (!merge || (stage == 2))) {
1036 cache_tree_free(&active_cache_tree);
1037 prime_cache_tree();
1038 }