diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
tree | d604d58fdb9d655e784d30b28b157e01eb289621 /t/t6025-merge-symlinks.sh | |
parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
download | git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.xz |
Merge branch 'sb/dashless'
* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
Diffstat (limited to 't/t6025-merge-symlinks.sh')
-rwxr-xr-x | t/t6025-merge-symlinks.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh index 6004deb43..fc58456a1 100755 --- a/t/t6025-merge-symlinks.sh +++ b/t/t6025-merge-symlinks.sh @@ -33,7 +33,7 @@ git-commit -m b-file' test_expect_success \ 'merge master into b-symlink, which has a different symbolic link' ' git-checkout b-symlink && -! git-merge master' +test_must_fail git-merge master' test_expect_success \ 'the merge result must be a file' ' @@ -42,7 +42,7 @@ test -f symlink' test_expect_success \ 'merge master into b-file, which has a file instead of a symbolic link' ' git-reset --hard && git-checkout b-file && -! git-merge master' +test_must_fail git-merge master' test_expect_success \ 'the merge result must be a file' ' @@ -52,7 +52,7 @@ test_expect_success \ 'merge b-file, which has a file instead of a symbolic link, into master' ' git-reset --hard && git-checkout master && -! git-merge b-file' +test_must_fail git-merge b-file' test_expect_success \ 'the merge result must be a file' ' |