diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-05 23:18:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 23:33:38 -0700 |
| commit | c3f13d59f75e144e615b4a5b480348057a7b8b3f (patch) | |
| tree | 1992ffdae5a13665332140edc125ac88b499e767 /t | |
| parent | a76d74fb7146d1785cdefc58a91c50ab9acec775 (diff) | |
| download | git-c3f13d59f75e144e615b4a5b480348057a7b8b3f.tar.gz git-c3f13d59f75e144e615b4a5b480348057a7b8b3f.tar.xz | |
[PATCH] 3-way merge tests for new "git-read-tree -m"?
The updated git-tread-tree -m is more strict in that it wants to
have the original cache up to date. The initial part of t1000
(merge tests from hell) fails due to it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1000-read-tree-m-3way.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh index 72bc12216..ba207c8bb 100755 --- a/t/t1000-read-tree-m-3way.sh +++ b/t/t1000-read-tree-m-3way.sh @@ -77,10 +77,27 @@ In addition: ################################################################ # Try merging and showing the various diffs -test_expect_success \ +# The tree is dirty at this point. +test_expect_failure \ '3-way merge with git-read-tree -m' \ "git-read-tree -m $tree_O $tree_A $tree_B" +# This is done on an empty work directory, which is the normal +# merge person behaviour. +test_expect_success \ + '3-way merge with git-read-tree -m' \ + "rm -fr [NDMALTS][NDMALTSF] Z && + rm .git/index && + git-read-tree -m $tree_O $tree_A $tree_B" + +# This starts out with the first head, which is the normal +# patch submitter behaviour. +test_expect_success \ + '3-way merge with git-read-tree -m' \ + "git-read-tree $tree_A && + git-checkout-cache -f -u -a && + git-read-tree -m $tree_O $tree_A $tree_B" + _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" test_expect_success \ |