summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-08 09:08:54 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 17:19:53 (GMT)
commit7d95ee935182a06374d152d7638bdd999e78f80b (patch)
treea229bed41314c77450d0cc188758286529ff59fe /t/t1002-read-tree-m-u-2way.sh
parent5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 (diff)
downloadgit-7d95ee935182a06374d152d7638bdd999e78f80b.zip
git-7d95ee935182a06374d152d7638bdd999e78f80b.tar.gz
git-7d95ee935182a06374d152d7638bdd999e78f80b.tar.bz2
[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>
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 75a4eaa..aebe21a 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -93,7 +93,7 @@ test_expect_success \
compare_change 5diff.out expected &&
check_cache_at yomin dirty &&
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 &&
diff yomin yomin1 &&
rm -f yomin1'
@@ -122,7 +122,7 @@ test_expect_success \
diff --unified=0 M.out 7.out &&
check_cache_at frotz dirty &&
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 &&
diff frotz frotz1 &&
rm -f frotz1'