From 036d51cc557bcf919246ad30cb2ac7736bfc836b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Jun 2005 02:53:57 -0700 Subject: [PATCH] read-tree: loosen too strict index requirements This patch teaches read-tree 3-way merge that, when only "the other tree" changed a path, and if the index file already has the same change, we are not in a situation that would clobber the index and the work tree, and lets the merge succeed; this is case #14ALT in t1000 test. It does not change the result of the merge, but prevents it from failing when it does not have to. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- read-tree.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'read-tree.c') diff --git a/read-tree.c b/read-tree.c index d86cc0263..0d94fe214 100644 --- a/read-tree.c +++ b/read-tree.c @@ -280,6 +280,12 @@ static int threeway_merge(struct cache_entry *stages[4], } /* otherwise we will apply the original rule */ } + /* #14ALT */ + if (a && b && c && same(a, b) && !same(a, c)) { + if (old && same(old, c)) + return merged_entry_allow_dirty(c, old, dst); + /* otherwise the regular rule applies */ + } /* * If we have an entry in the index cache ("old"), then we want * to make sure that it matches any entries in stage 2 ("first -- cgit v1.2.1