undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] read-tree: loosen too strict index requirements

Browse Source 
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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-06-11 02:53:57 -07:00 committed by Linus Torvalds
parent 32192e6622
commit 036d51cc55
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
read-tree.c
View File

@ -280,6 +280,12 @@ static int threeway_merge(struct cache_entry *stages[4],
} }
/* otherwise we will apply the original rule */ /* 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 * 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 * to make sure that it matches any entries in stage 2 ("first

9
t/t1000-read-tree-m-3way.sh
View File

@ -464,6 +464,15 @@ test_expect_success \
git-read-tree -m $tree_O $tree_A $tree_B && git-read-tree -m $tree_O $tree_A $tree_B &&
check_result" check_result"
test_expect_success \
'14 - may match B in O && A && B && O==A && O!=B case' \
"rm -f .git/index NM &&
cp .orig-B/NM NM &&
git-update-cache --add NM &&
echo extra >>NM &&
git-read-tree -m $tree_O $tree_A $tree_B &&
check_result"
test_expect_failure \ test_expect_failure \
'14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case' \ '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case' \
"rm -f .git/index NM && "rm -f .git/index NM &&