diff options
| author | Elijah Newren <newren@gmail.com> | 2010-10-03 14:00:11 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:26:13 -0700 |
| commit | af7b252619fd9f73ab6a06af09e7e62838c5f54b (patch) | |
| tree | b5d93cdf9db1344f7aacf79704bd89ca3d5d1188 /t/t7601-merge-pull-config.sh | |
| parent | a2b1e53b94e99fa88394b1317be478d5c5d864dc (diff) | |
| download | git-af7b252619fd9f73ab6a06af09e7e62838c5f54b.tar.gz git-af7b252619fd9f73ab6a06af09e7e62838c5f54b.tar.xz | |
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>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 7ba94ea99..b44b29395 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -114,13 +114,13 @@ test_expect_success 'setup conflicted merge' ' test_expect_success 'merge picks up the best result' ' git config --unset-all pull.twohead && git reset --hard c5 && - git merge -s resolve c6 + test_must_fail git merge -s resolve c6 && resolve_count=$(conflict_count) && git reset --hard c5 && - git merge -s recursive c6 + test_must_fail git merge -s recursive c6 && recursive_count=$(conflict_count) && git reset --hard c5 && - git merge -s recursive -s resolve c6 + test_must_fail git merge -s recursive -s resolve c6 && auto_count=$(conflict_count) && test $auto_count = $recursive_count && test $auto_count != $resolve_count @@ -129,13 +129,13 @@ test_expect_success 'merge picks up the best result' ' test_expect_success 'merge picks up the best result (from config)' ' git config pull.twohead "recursive resolve" && git reset --hard c5 && - git merge -s resolve c6 + test_must_fail git merge -s resolve c6 && resolve_count=$(conflict_count) && git reset --hard c5 && - git merge -s recursive c6 + test_must_fail git merge -s recursive c6 && recursive_count=$(conflict_count) && git reset --hard c5 && - git merge c6 + test_must_fail git merge c6 && auto_count=$(conflict_count) && test $auto_count = $recursive_count && test $auto_count != $resolve_count |