Skip to content

Commit 93fc423

Browse files
john-caigitster
authored andcommitted
t4004-diff-rename-symlink: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9297229 commit 93fc423

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

t/t4004-diff-rename-symlink.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ TEST_PASSES_SANITIZE_LEAK=true
1414
. ./test-lib.sh
1515
. "$TEST_DIRECTORY"/lib-diff.sh
1616

17-
test_expect_success SYMLINKS \
18-
'prepare reference tree' \
19-
'echo xyzzy | tr -d '\\\\'012 >yomin &&
20-
ln -s xyzzy frotz &&
21-
git update-index --add frotz yomin &&
22-
tree=$(git write-tree) &&
23-
echo $tree'
17+
test_expect_success SYMLINKS 'prepare reference tree' '
18+
echo xyzzy | tr -d '\\\\'012 >yomin &&
19+
ln -s xyzzy frotz &&
20+
git update-index --add frotz yomin &&
21+
tree=$(git write-tree) &&
22+
echo $tree
23+
'
2424

25-
test_expect_success SYMLINKS \
26-
'prepare work tree' \
27-
'mv frotz rezrov &&
28-
rm -f yomin &&
29-
ln -s xyzzy nitfol &&
30-
ln -s xzzzy bozbar &&
31-
git update-index --add --remove frotz rezrov nitfol bozbar yomin'
25+
test_expect_success SYMLINKS 'prepare work tree' '
26+
mv frotz rezrov &&
27+
rm -f yomin &&
28+
ln -s xyzzy nitfol &&
29+
ln -s xzzzy bozbar &&
30+
git update-index --add --remove frotz rezrov nitfol bozbar yomin
31+
'
3232

3333
# tree has frotz pointing at xyzzy, and yomin that contains xyzzy to
3434
# confuse things. work tree has rezrov (xyzzy) nitfol (xyzzy) and
3535
# bozbar (xzzzy).
3636
# rezrov and nitfol are rename/copy of frotz and bozbar should be
3737
# a new creation.
3838

39-
test_expect_success SYMLINKS 'setup diff output' "
40-
GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
41-
cat >expected <<\EOF
39+
test_expect_success SYMLINKS 'setup diff output' '
40+
GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
41+
cat >expected <<\EOF
4242
diff --git a/bozbar b/bozbar
4343
new file mode 120000
4444
--- /dev/null
@@ -62,10 +62,10 @@ deleted file mode 100644
6262
-xyzzy
6363
\ No newline at end of file
6464
EOF
65-
"
65+
'
6666

67-
test_expect_success SYMLINKS \
68-
'validate diff output' \
69-
'compare_diff_patch current expected'
67+
test_expect_success SYMLINKS 'validate diff output' '
68+
compare_diff_patch current expected
69+
'
7070

7171
test_done

0 commit comments

Comments
 (0)