Skip to content

Commit cd26cd6

Browse files
ffyuandagitster
ffyuanda
authored and
gitster
committed
t/lib-read-tree-m-3way: indent with tabs
As Documentation/CodingGuidelines says, our shell scripts (including tests) are to use HT for indentation, but this script uses 4-column indent with SP. Fix this. Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent ddea571 commit cd26cd6

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎t/lib-read-tree-m-3way.sh‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
mkdir Z
44
for a in N D M
55
do
6-
for b in N D M
7-
do
8-
p=$a$b
6+
for b in N D M
7+
do
8+
p=$a$b
99
echo This is $p from the original tree. >$p
1010
echo This is Z/$p from the original tree. >Z/$p
1111
test_expect_success "adding test file $p and Z/$p" '
@@ -16,7 +16,7 @@ do
1616
done
1717
echo This is SS from the original tree. >SS
1818
test_expect_success 'adding test file SS' '
19-
git update-index --add SS
19+
git update-index --add SS
2020
'
2121
cat >TT <<\EOF
2222
This is a trivial merge sample text.
@@ -31,10 +31,10 @@ the word, expected to be upcased by Branch B.
3131
This concludes the trivial merge sample file.
3232
EOF
3333
test_expect_success 'adding test file TT' '
34-
git update-index --add TT
34+
git update-index --add TT
3535
'
3636
test_expect_success 'prepare initial tree' '
37-
tree_O=$(git write-tree)
37+
tree_O=$(git write-tree)
3838
'
3939

4040
################################################################
@@ -46,46 +46,46 @@ test_expect_success 'prepare initial tree' '
4646
to_remove=$(echo D? Z/D?)
4747
rm -f $to_remove
4848
test_expect_success 'change in branch A (removal)' '
49-
git update-index --remove $to_remove
49+
git update-index --remove $to_remove
5050
'
5151

5252
for p in M? Z/M?
5353
do
54-
echo This is modified $p in the branch A. >$p
55-
test_expect_success 'change in branch A (modification)' '
56-
git update-index $p
57-
'
54+
echo This is modified $p in the branch A. >$p
55+
test_expect_success 'change in branch A (modification)' '
56+
git update-index $p
57+
'
5858
done
5959

6060
for p in AN AA Z/AN Z/AA
6161
do
62-
echo This is added $p in the branch A. >$p
63-
test_expect_success 'change in branch A (addition)' '
64-
git update-index --add $p
65-
'
62+
echo This is added $p in the branch A. >$p
63+
test_expect_success 'change in branch A (addition)' '
64+
git update-index --add $p
65+
'
6666
done
6767

6868
echo This is SS from the modified tree. >SS
6969
echo This is LL from the modified tree. >LL
7070
test_expect_success 'change in branch A (addition)' '
71-
git update-index --add LL &&
72-
git update-index SS
71+
git update-index --add LL &&
72+
git update-index SS
7373
'
7474
mv TT TT-
7575
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
7676
rm -f TT-
7777
test_expect_success 'change in branch A (edit)' '
78-
git update-index TT
78+
git update-index TT
7979
'
8080

8181
mkdir DF
8282
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
8383
test_expect_success 'change in branch A (change file to directory)' '
84-
git update-index --add DF/DF
84+
git update-index --add DF/DF
8585
'
8686

8787
test_expect_success 'recording branch A tree' '
88-
tree_A=$(git write-tree)
88+
tree_A=$(git write-tree)
8989
'
9090

9191
################################################################
@@ -95,64 +95,64 @@ test_expect_success 'recording branch A tree' '
9595
rm -rf [NDMASLT][NDMASLT] Z DF
9696
mkdir Z
9797
test_expect_success 'reading original tree and checking out' '
98-
git read-tree $tree_O &&
99-
git checkout-index -a
98+
git read-tree $tree_O &&
99+
git checkout-index -a
100100
'
101101

102102
to_remove=$(echo ?D Z/?D)
103103
rm -f $to_remove
104104
test_expect_success 'change in branch B (removal)' '
105-
git update-index --remove $to_remove
105+
git update-index --remove $to_remove
106106
'
107107

108108
for p in ?M Z/?M
109109
do
110-
echo This is modified $p in the branch B. >$p
111-
test_expect_success 'change in branch B (modification)' '
112-
git update-index $p
113-
'
110+
echo This is modified $p in the branch B. >$p
111+
test_expect_success 'change in branch B (modification)' '
112+
git update-index $p
113+
'
114114
done
115115

116116
for p in NA AA Z/NA Z/AA
117117
do
118-
echo This is added $p in the branch B. >$p
119-
test_expect_success 'change in branch B (addition)' '
120-
git update-index --add $p
121-
'
118+
echo This is added $p in the branch B. >$p
119+
test_expect_success 'change in branch B (addition)' '
120+
git update-index --add $p
121+
'
122122
done
123123
echo This is SS from the modified tree. >SS
124124
echo This is LL from the modified tree. >LL
125125
test_expect_success 'change in branch B (addition and modification)' '
126-
git update-index --add LL &&
127-
git update-index SS
126+
git update-index --add LL &&
127+
git update-index SS
128128
'
129129
mv TT TT-
130130
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
131131
rm -f TT-
132132
test_expect_success 'change in branch B (modification)' '
133-
git update-index TT
133+
git update-index TT
134134
'
135135

136136
echo Branch B makes a file at DF. >DF
137137
test_expect_success 'change in branch B (addition of a file to conflict with directory)' '
138-
git update-index --add DF
138+
git update-index --add DF
139139
'
140140

141141
test_expect_success 'recording branch B tree' '
142-
tree_B=$(git write-tree)
142+
tree_B=$(git write-tree)
143143
'
144144

145145
test_expect_success 'keep contents of 3 trees for easy access' '
146-
rm -f .git/index &&
147-
git read-tree $tree_O &&
148-
mkdir .orig-O &&
149-
git checkout-index --prefix=.orig-O/ -f -q -a &&
150-
rm -f .git/index &&
151-
git read-tree $tree_A &&
152-
mkdir .orig-A &&
153-
git checkout-index --prefix=.orig-A/ -f -q -a &&
154-
rm -f .git/index &&
155-
git read-tree $tree_B &&
156-
mkdir .orig-B &&
157-
git checkout-index --prefix=.orig-B/ -f -q -a
146+
rm -f .git/index &&
147+
git read-tree $tree_O &&
148+
mkdir .orig-O &&
149+
git checkout-index --prefix=.orig-O/ -f -q -a &&
150+
rm -f .git/index &&
151+
git read-tree $tree_A &&
152+
mkdir .orig-A &&
153+
git checkout-index --prefix=.orig-A/ -f -q -a &&
154+
rm -f .git/index &&
155+
git read-tree $tree_B &&
156+
mkdir .orig-B &&
157+
git checkout-index --prefix=.orig-B/ -f -q -a
158158
'

0 commit comments

Comments
 (0)