t6025: modernize style

The tests in `t6025-merge-symlinks.sh` were written a long time ago, and
has a lot of style violations, including the mixed-use of tabs and spaces,
missing indentations, and other shell script style violations. Update it to
match the CodingGuidelines.

Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index 433c4de08f0cc8d220d5368ab2ab0dffde372482..d257dcf34d25dd96a997a4ed547fa50aca40e1af 100755 (executable)
--- a/t/t6025-merge-symlinks.sh
+++ b/t/t6025-merge-symlinks.sh
@@ -10,52 +10,53 @@ if core.symlinks is false.'
 
 . ./test-lib.sh
 
-test_expect_success \
-'setup' '
-git config core.symlinks false &&
-> file &&
-git add file &&
-git commit -m initial &&
-git branch b-symlink &&
-git branch b-file &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l        symlink" | git update-index --index-info &&
-git commit -m master &&
-git checkout b-symlink &&
-l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-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 commit -m b-file'
-
-test_expect_success \
-'merge master into b-symlink, which has a different symbolic link' '
-git checkout b-symlink &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-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 &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_expect_success \
-'merge b-file, which has a file instead of a symbolic link, into master' '
-git reset --hard &&
-git checkout master &&
-test_must_fail git merge b-file'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
+test_expect_success 'setup' '
+       git config core.symlinks false &&
+       >file &&
+       git add file &&
+       git commit -m initial &&
+       git branch b-symlink &&
+       git branch b-file &&
+       l=$(printf file | git hash-object -t blob -w --stdin) &&
+       echo "120000 $l symlink" | git update-index --index-info &&
+       git commit -m master &&
+       git checkout b-symlink &&
+       l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+       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 commit -m b-file
+'
+
+test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
+       git checkout b-symlink &&
+       test_must_fail git merge master
+'
+
+test_expect_success 'the merge result must be a file' '
+       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 &&
+       test_must_fail git merge master
+'
+
+test_expect_success 'the merge result must be a file' '
+       test -f symlink
+'
+
+test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
+       git reset --hard &&
+       git checkout master &&
+       test_must_fail git merge b-file
+'
+
+test_expect_success 'the merge result must be a file' '
+       test -f symlink
+'
 
 test_done