@@ -12,15 +12,16 @@ cat > expected <<\EOF
12
12
100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
13
13
100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
14
14
EOF
15
- test_expect_success ' update-index --add' \
16
- ' echo hello world >file1 &&
17
- echo goodbye people >file2 &&
18
- git update-index --add file1 file2 &&
19
- git ls-files -s >current &&
20
- cmp current expected'
15
+ test_expect_success ' update-index --add' '
16
+ echo hello world >file1 &&
17
+ echo goodbye people >file2 &&
18
+ git update-index --add file1 file2 &&
19
+ git ls-files -s >current &&
20
+ cmp current expected
21
+ '
21
22
22
- test_expect_success ' update-index --again' \
23
- ' rm -f file1 &&
23
+ test_expect_success ' update-index --again' '
24
+ rm -f file1 &&
24
25
echo hello everybody >file2 &&
25
26
if git update-index --again
26
27
then
@@ -29,56 +30,61 @@ test_expect_success 'update-index --again' \
29
30
else
30
31
echo happy - failed as expected
31
32
fi &&
32
- git ls-files -s >current &&
33
- cmp current expected'
33
+ git ls-files -s >current &&
34
+ cmp current expected
35
+ '
34
36
35
37
cat > expected << \EOF
36
38
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
37
39
EOF
38
- test_expect_success ' update-index --remove --again' \
39
- ' git update-index --remove --again &&
40
- git ls-files -s >current &&
41
- cmp current expected'
40
+ test_expect_success ' update-index --remove --again' '
41
+ git update-index --remove --again &&
42
+ git ls-files -s >current &&
43
+ cmp current expected
44
+ '
42
45
43
46
test_expect_success ' first commit' ' git commit -m initial'
44
47
45
48
cat > expected << \EOF
46
49
100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
47
50
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
48
51
EOF
49
- test_expect_success ' update-index again' \
50
- ' mkdir -p dir1 &&
52
+ test_expect_success ' update-index again' '
53
+ mkdir -p dir1 &&
51
54
echo hello world >dir1/file3 &&
52
55
echo goodbye people >file2 &&
53
56
git update-index --add file2 dir1/file3 &&
54
57
echo hello everybody >file2 &&
55
58
echo happy >dir1/file3 &&
56
59
git update-index --again &&
57
60
git ls-files -s >current &&
58
- cmp current expected'
61
+ cmp current expected
62
+ '
59
63
60
64
cat > expected << \EOF
61
65
100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3
62
66
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
63
67
EOF
64
- test_expect_success ' update-index --update from subdir' \
65
- ' echo not so happy >file2 &&
68
+ test_expect_success ' update-index --update from subdir' '
69
+ echo not so happy >file2 &&
66
70
(cd dir1 &&
67
71
cat ../file2 >file3 &&
68
72
git update-index --again
69
73
) &&
70
74
git ls-files -s >current &&
71
- cmp current expected'
75
+ cmp current expected
76
+ '
72
77
73
78
cat > expected << \EOF
74
79
100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3
75
80
100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
76
81
EOF
77
- test_expect_success ' update-index --update with pathspec' \
78
- ' echo very happy >file2 &&
82
+ test_expect_success ' update-index --update with pathspec' '
83
+ echo very happy >file2 &&
79
84
cat file2 >dir1/file3 &&
80
85
git update-index --again dir1/ &&
81
86
git ls-files -s >current &&
82
- cmp current expected'
87
+ cmp current expected
88
+ '
83
89
84
90
test_done
0 commit comments