help--browse: add '--config' option to check a config option for a browser.

[git.git] / t / t6025-merge-symlinks.sh

diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index 3c1a6972bd05608d9ed1a244996e7eb72056ed6d..6004deb43228836f61e0c4b8762a2511a2c1780a 100755 (executable)
--- a/t/t6025-merge-symlinks.sh
+++ b/t/t6025-merge-symlinks.sh
@@ -12,48 +12,47 @@ if core.symlinks is false.'
 
 test_expect_success \
 'setup' '
-git-config core.symlinks false &&
+git config core.symlinks false &&
 > file &&
-git-add file &&
+git add file &&
 git-commit -m initial &&
-git-branch b-symlink &&
-git-branch b-file &&
+git branch b-symlink &&
+git branch b-file &&
 l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
-echo "120000 $l        symlink" | git-update-index --index-info &&
+echo "120000 $l        symlink" | git update-index --index-info &&
 git-commit -m master &&
 git-checkout b-symlink &&
 l=$(echo -n file-different | git-hash-object -t blob -w --stdin) &&
-echo "120000 $l        symlink" | git-update-index --index-info &&
+echo "120000 $l        symlink" | git update-index --index-info &&
 git-commit -m b-symlink &&
 git-checkout b-file &&
 echo plain-file > symlink &&
-git-add symlink &&
+git add symlink &&
 git-commit -m b-file'
 
-test_expect_failure \
+test_expect_success \
 'merge master into b-symlink, which has a different symbolic link' '
-! git-checkout b-symlink ||
-git-merge master'
+git-checkout b-symlink &&
+! git-merge master'
 
 test_expect_success \
 'the merge result must be a file' '
 test -f symlink'
 
-test_expect_failure \
+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'
+git-reset --hard && git-checkout b-file &&
+! git-merge master'
 
 test_expect_success \
 'the merge result must be a file' '
 test -f symlink'
 
-test_expect_failure \
+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'
+git-reset --hard &&
+git-checkout master &&
+! git-merge b-file'
 
 test_expect_success \
 'the merge result must be a file' '