Skip to content

Commit af7dd8b

Browse files
Beat Bolligitster
Beat Bolli
authored and
gitster
committed
t/t9*: avoid redundant uses of cat
Signed-off-by: Beat Bolli <[email protected]> Acked-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a28a5ea commit af7dd8b

File tree

6 files changed

+26
-33
lines changed

6 files changed

+26
-33
lines changed

‎t/t9300-fast-import.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ test_expect_success 'L: nested tree copy does not corrupt deltas' '
986986
test_when_finished "git update-ref -d refs/heads/L2" &&
987987
git fast-import <input &&
988988
git ls-tree L2 g/b/ >tmp &&
989-
cat tmp | cut -f 2 >actual &&
989+
cut -f 2 <tmp >actual &&
990990
test_cmp expect actual &&
991991
git fsck $(git rev-parse L2)
992992
'
@@ -2007,12 +2007,11 @@ test_expect_success 'Q: verify first notes commit' '
20072007
'
20082008

20092009
test_expect_success 'Q: verify first notes tree' '
2010-
cat >expect.unsorted <<-EOF &&
2010+
sort >expect <<-EOF &&
20112011
100644 blob $commit1
20122012
100644 blob $commit2
20132013
100644 blob $commit3
20142014
EOF
2015-
cat expect.unsorted | sort >expect &&
20162015
git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
20172016
test_cmp expect actual
20182017
'
@@ -2048,12 +2047,11 @@ test_expect_success 'Q: verify second notes commit' '
20482047
'
20492048

20502049
test_expect_success 'Q: verify second notes tree' '
2051-
cat >expect.unsorted <<-EOF &&
2050+
sort >expect <<-EOF &&
20522051
100644 blob $commit1
20532052
100644 blob $commit2
20542053
100644 blob $commit3
20552054
EOF
2056-
cat expect.unsorted | sort >expect &&
20572055
git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
20582056
test_cmp expect actual
20592057
'
@@ -2088,10 +2086,9 @@ test_expect_success 'Q: verify third notes commit' '
20882086
'
20892087

20902088
test_expect_success 'Q: verify third notes tree' '
2091-
cat >expect.unsorted <<-EOF &&
2089+
sort >expect <<-EOF &&
20922090
100644 blob $commit1
20932091
EOF
2094-
cat expect.unsorted | sort >expect &&
20952092
git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
20962093
test_cmp expect actual
20972094
'
@@ -2115,10 +2112,9 @@ test_expect_success 'Q: verify fourth notes commit' '
21152112
'
21162113

21172114
test_expect_success 'Q: verify fourth notes tree' '
2118-
cat >expect.unsorted <<-EOF &&
2115+
sort >expect <<-EOF &&
21192116
100644 blob $commit2
21202117
EOF
2121-
cat expect.unsorted | sort >expect &&
21222118
git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
21232119
test_cmp expect actual
21242120
'

‎t/t9350-fast-export.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ EOF
236236

237237
test_expect_success 'set up faked signed tag' '
238238
239-
cat signed-tag-import | git fast-import
239+
git fast-import <signed-tag-import
240240
241241
'
242242

‎t/t9400-git-cvsserver-server.sh

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ END VERIFICATION REQUEST
117117
EOF
118118

119119
test_expect_success 'pserver authentication' '
120-
cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
120+
git-cvsserver pserver <request-anonymous >log 2>&1 &&
121121
sed -ne \$p log | grep "^I LOVE YOU\$"
122122
'
123123

124124
test_expect_success 'pserver authentication failure (non-anonymous user)' '
125-
if cat request-git | git-cvsserver pserver >log 2>&1
125+
if git-cvsserver pserver <request-git >log 2>&1
126126
then
127127
false
128128
else
@@ -132,17 +132,17 @@ test_expect_success 'pserver authentication failure (non-anonymous user)' '
132132
'
133133

134134
test_expect_success 'pserver authentication success (non-anonymous user with password)' '
135-
cat login-git-ok | git-cvsserver pserver >log 2>&1 &&
135+
git-cvsserver pserver <login-git-ok >log 2>&1 &&
136136
sed -ne \$p log | grep "^I LOVE YOU\$"
137137
'
138138

139139
test_expect_success 'pserver authentication (login)' '
140-
cat login-anonymous | git-cvsserver pserver >log 2>&1 &&
140+
git-cvsserver pserver <login-anonymous >log 2>&1 &&
141141
sed -ne \$p log | grep "^I LOVE YOU\$"
142142
'
143143

144144
test_expect_success 'pserver authentication failure (login/non-anonymous user)' '
145-
if cat login-git | git-cvsserver pserver >log 2>&1
145+
if git-cvsserver pserver <login-git >log 2>&1
146146
then
147147
false
148148
else
@@ -172,7 +172,7 @@ Root $WORKDIR
172172
EOF
173173

174174
test_expect_success 'req_Root failure (relative pathname)' '
175-
if cat request-relative | git-cvsserver pserver >log 2>&1
175+
if git-cvsserver pserver <request-relative >log 2>&1
176176
then
177177
echo unexpected success
178178
false
@@ -183,28 +183,26 @@ test_expect_success 'req_Root failure (relative pathname)' '
183183
'
184184

185185
test_expect_success 'req_Root failure (conflicting roots)' '
186-
cat request-conflict | git-cvsserver pserver >log 2>&1 &&
186+
git-cvsserver pserver <request-conflict >log 2>&1 &&
187187
tail log | grep "^error 1 Conflicting roots specified$"
188188
'
189189

190190
test_expect_success 'req_Root (strict paths)' '
191-
cat request-anonymous | git-cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
191+
git-cvsserver --strict-paths pserver "$SERVERDIR" <request-anonymous >log 2>&1 &&
192192
sed -ne \$p log | grep "^I LOVE YOU\$"
193193
'
194194

195195
test_expect_success 'req_Root failure (strict-paths)' '
196-
! cat request-anonymous |
197-
git-cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
196+
! git-cvsserver --strict-paths pserver "$WORKDIR" <request-anonymous >log 2>&1
198197
'
199198

200199
test_expect_success 'req_Root (w/o strict-paths)' '
201-
cat request-anonymous | git-cvsserver pserver "$WORKDIR/" >log 2>&1 &&
200+
git-cvsserver pserver "$WORKDIR/" <request-anonymous >log 2>&1 &&
202201
sed -ne \$p log | grep "^I LOVE YOU\$"
203202
'
204203

205204
test_expect_success 'req_Root failure (w/o strict-paths)' '
206-
! cat request-anonymous |
207-
git-cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
205+
! git-cvsserver pserver "$WORKDIR/gitcvs" <request-anonymous >log 2>&1
208206
'
209207

210208
cat >request-base <<EOF
@@ -217,27 +215,26 @@ Root /gitcvs.git
217215
EOF
218216

219217
test_expect_success 'req_Root (base-path)' '
220-
cat request-base | git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
218+
git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
221219
sed -ne \$p log | grep "^I LOVE YOU\$"
222220
'
223221

224222
test_expect_success 'req_Root failure (base-path)' '
225-
! cat request-anonymous |
226-
git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
223+
! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
227224
'
228225

229226
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false || exit 1
230227

231228
test_expect_success 'req_Root (export-all)' '
232-
cat request-anonymous | git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
229+
git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
233230
sed -ne \$p log | grep "^I LOVE YOU\$"
234231
'
235232

236233
test_expect_success 'req_Root failure (export-all w/o directory list)' '
237-
! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'
234+
! (git-cvsserver --export-all pserver <request-anonymous >log 2>&1 || false)'
238235

239236
test_expect_success 'req_Root (everything together)' '
240-
cat request-base | git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
237+
git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
241238
sed -ne \$p log | grep "^I LOVE YOU\$"
242239
'
243240

‎t/t9802-git-p4-filetype.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ test_expect_success 'keyword file create' '
175175
cp k-text-k k-text-ko &&
176176
p4 add -t text+ko k-text-ko &&
177177
178-
cat k-text-k | iconv -f ascii -t utf-16 >k-utf16-k &&
178+
iconv -f ascii -t utf-16 <k-text-k >k-utf16-k &&
179179
p4 add -t utf16+k k-utf16-k &&
180180
181181
cp k-utf16-k k-utf16-ko &&

‎t/t9807-git-p4-submit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ test_expect_success 'description with Jobs and values on separate lines' '
418418
marshal_dump job0 <change &&
419419
marshal_dump job1 <change
420420
) | sort >jobs &&
421-
cat jobname1 jobname2 | sort >expected &&
421+
sort jobname1 jobname2 >expected &&
422422
test_cmp expected jobs
423423
)
424424
'

‎t/t9824-git-p4-git-lfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ test_file_in_lfs () {
1717
sed -n '2,2 p' "$FILE" | grep "^oid " &&
1818
sed -n '3,3 p' "$FILE" | grep "^size " &&
1919
test_line_count = 3 "$FILE" &&
20-
cat "$FILE" | grep "size $SIZE" &&
21-
HASH=$(cat "$FILE" | grep "oid sha256:" | sed -e "s/oid sha256://g") &&
20+
grep "size $SIZE" "$FILE" &&
21+
HASH=$(grep "oid sha256:" "$FILE" | sed -e "s/oid sha256://g") &&
2222
LFS_FILE=".git/lfs/objects/$(echo "$HASH" | cut -c1-2)/$(echo "$HASH" | cut -c3-4)/$HASH" &&
2323
echo $EXPECTED_CONTENT >expect &&
2424
test_path_is_file "$FILE" &&

0 commit comments

Comments
 (0)