@@ -14,31 +14,31 @@ TEST_PASSES_SANITIZE_LEAK=true
14
14
. ./test-lib.sh
15
15
. " $TEST_DIRECTORY " /lib-diff.sh
16
16
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
+ '
24
24
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
+ '
32
32
33
33
# tree has frotz pointing at xyzzy, and yomin that contains xyzzy to
34
34
# confuse things. work tree has rezrov (xyzzy) nitfol (xyzzy) and
35
35
# bozbar (xzzzy).
36
36
# rezrov and nitfol are rename/copy of frotz and bozbar should be
37
37
# a new creation.
38
38
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
42
42
diff --git a/bozbar b/bozbar
43
43
new file mode 120000
44
44
--- /dev/null
@@ -62,10 +62,10 @@ deleted file mode 100644
62
62
-xyzzy
63
63
\ No newline at end of file
64
64
EOF
65
- "
65
+ '
66
66
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
+ '
70
70
71
71
test_done
0 commit comments