mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
[PATCH] Tests: read-tree -m test updates.
This updates t1000 (basic 3-way merge test) to check the merge results for both successful cases (earlier one checked the result for only one of them). Also fixes typos in t1002 that broke '&&' chain, potentially missing a test failure before the chain got broken. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
5b1ea09de1
commit
7d95ee9351
|
@ -77,34 +77,6 @@ In addition:
|
||||||
################################################################
|
################################################################
|
||||||
# Try merging and showing the various diffs
|
# Try merging and showing the various diffs
|
||||||
|
|
||||||
# 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 \
|
|
||||||
'git-ls-files --stage of the merge result' \
|
|
||||||
'git-ls-files --stage >current- &&
|
|
||||||
sed -e "s/ $_x40 / X /" <current- >current'
|
|
||||||
|
|
||||||
cat >expected <<\EOF
|
cat >expected <<\EOF
|
||||||
100644 X 2 AA
|
100644 X 2 AA
|
||||||
100644 X 3 AA
|
100644 X 3 AA
|
||||||
|
@ -154,8 +126,34 @@ cat >expected <<\EOF
|
||||||
100644 X 0 Z/NN
|
100644 X 0 Z/NN
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
_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"
|
||||||
|
|
||||||
|
# The tree is dirty at this point.
|
||||||
|
test_expect_failure \
|
||||||
|
'3-way merge with git-read-tree -m, dirty cache' \
|
||||||
|
"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 \
|
test_expect_success \
|
||||||
'validate merge result' \
|
'3-way merge with git-read-tree -m, empty cache' \
|
||||||
'diff current expected'
|
"rm -fr [NDMALTS][NDMALTSF] Z &&
|
||||||
|
rm .git/index &&
|
||||||
|
git-read-tree -m $tree_O $tree_A $tree_B &&
|
||||||
|
git-ls-files --stage |
|
||||||
|
sed -e 's/ $_x40 / X /' >current &&
|
||||||
|
diff -u expected current"
|
||||||
|
|
||||||
|
# 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, match H' \
|
||||||
|
"git-read-tree $tree_A &&
|
||||||
|
git-checkout-cache -f -u -a &&
|
||||||
|
git-read-tree -m $tree_O $tree_A $tree_B &&
|
||||||
|
git-ls-files --stage |
|
||||||
|
sed -e 's/ $_x40 / X /' >current &&
|
||||||
|
diff -u expected current"
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
@ -93,7 +93,7 @@ test_expect_success \
|
||||||
compare_change 5diff.out expected &&
|
compare_change 5diff.out expected &&
|
||||||
check_cache_at yomin dirty &&
|
check_cache_at yomin dirty &&
|
||||||
sha1sum -c M.sha1 &&
|
sha1sum -c M.sha1 &&
|
||||||
: dirty index should have prevented -u from checking it out.
|
: dirty index should have prevented -u from checking it out. &&
|
||||||
echo yomin yomin >yomin1 &&
|
echo yomin yomin >yomin1 &&
|
||||||
diff yomin yomin1 &&
|
diff yomin yomin1 &&
|
||||||
rm -f yomin1'
|
rm -f yomin1'
|
||||||
|
@ -122,7 +122,7 @@ test_expect_success \
|
||||||
diff --unified=0 M.out 7.out &&
|
diff --unified=0 M.out 7.out &&
|
||||||
check_cache_at frotz dirty &&
|
check_cache_at frotz dirty &&
|
||||||
if sha1sum -c M.sha1; then false; else :; fi &&
|
if sha1sum -c M.sha1; then false; else :; fi &&
|
||||||
: dirty index should have prevented -u from checking it out.
|
: dirty index should have prevented -u from checking it out. &&
|
||||||
echo frotz frotz >frotz1 &&
|
echo frotz frotz >frotz1 &&
|
||||||
diff frotz frotz1 &&
|
diff frotz frotz1 &&
|
||||||
rm -f frotz1'
|
rm -f frotz1'
|
||||||
|
|
Loading…
Reference in a new issue