t7601 (merge-pull-config): add missing &&
Also prefix several relevant git merge commands with 'test_must_fail' to keep the tests passing. Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Oct 3, 2010 at 14:00 UTC
af7b252619fd9f73ab6a06af09e7e62838c5f54b
1 file changed
+6
-6
t/t7601-merge-pull-config.sh
+6
-6
@@ -114,13 +114,13 @@ test_expect_success 'setup conflicted merge' '
114
test_expect_success 'merge picks up the best result' '
115
git config --unset-all pull.twohead &&
116
git reset --hard c5 &&
117
- git merge -s resolve c6
117
+ test_must_fail git merge -s resolve c6 &&
118
resolve_count=$(conflict_count) &&
119
git reset --hard c5 &&
120
- git merge -s recursive c6
120
+ test_must_fail git merge -s recursive c6 &&
121
recursive_count=$(conflict_count) &&
122
git reset --hard c5 &&
123
- git merge -s recursive -s resolve c6
123
+ test_must_fail git merge -s recursive -s resolve c6 &&
124
auto_count=$(conflict_count) &&
125
test $auto_count = $recursive_count &&
126
test $auto_count != $resolve_count
@@ -129,13 +129,13 @@ test_expect_success 'merge picks up the best result' '
129
test_expect_success 'merge picks up the best result (from config)' '
130
git config pull.twohead "recursive resolve" &&
131
git reset --hard c5 &&
132
- git merge -s resolve c6
132
+ test_must_fail git merge -s resolve c6 &&
133
resolve_count=$(conflict_count) &&
134
git reset --hard c5 &&
135
- git merge -s recursive c6
135
+ test_must_fail git merge -s recursive c6 &&
136
recursive_count=$(conflict_count) &&
137
git reset --hard c5 &&
138
- git merge c6
138
+ test_must_fail git merge c6 &&
139
auto_count=$(conflict_count) &&
140
test $auto_count = $recursive_count &&
141
test $auto_count != $resolve_count