mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Add read-tree -m 3-way merge tests.

Browse Source 
This adds a set of tests to make sure that requirements on
existing cache entries are checked when a read-tree -m 3-way
merge is run with an already populated index file.

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-08 14:55:35 -07:00
committed by Linus Torvalds
parent 8544a6f1b8
commit f225b21807
2 changed files with 366 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/lib-read-tree-m-3way.sh
View File

@ -142,3 +142,17 @@ test_expect_success \
'recording branch B tree' \
'tree_B=$(git-write-tree)'
test_expect_success \
'keep contents of 3 trees for easy access' \
'rm -f .git/index &&
git-read-tree $tree_O &&
mkdir .orig-O &&
git-checkout-cache --prefix=.orig-O/ -f -q -a &&
rm -f .git/index &&
git-read-tree $tree_A &&
mkdir .orig-A &&
git-checkout-cache --prefix=.orig-A/ -f -q -a &&
rm -f .git/index &&
git-read-tree $tree_B &&
mkdir .orig-B &&
git-checkout-cache --prefix=.orig-B/ -f -q -a'