Skip to content

Commit d87f0c7

Browse files
jeffhostetlerdscho
authored andcommitted
t5799: cleanup wc-l and grep-c lines
Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 21e7f37 commit d87f0c7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

t/t5799-gvfs-helper.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ get_list_of_oids () {
7373

7474
if test $# -eq 1
7575
then
76-
actual_nr=$(( $(wc -l <"$OIDS_FILE") ))
76+
actual_nr=$(wc -l <"$OIDS_FILE")
7777
if test $actual_nr -lt $1
7878
then
7979
echo "get_list_of_oids: insufficient data. Need $1 OIDs."
@@ -93,7 +93,7 @@ get_list_of_commit_and_tree_oids () {
9393

9494
if test $# -eq 1
9595
then
96-
actual_nr=$(( $(wc -l <"$OIDS_CT_FILE") ))
96+
actual_nr=$(wc -l <"$OIDS_CT_FILE")
9797
if test $actual_nr -lt $1
9898
then
9999
echo "get_list_of_commit_and_tree_oids: insufficient data. Need $1 OIDs."
@@ -123,6 +123,8 @@ test_expect_success 'setup repos' '
123123
# test_commit() creates commits, trees, tags, and blobs and leave
124124
# them loose.
125125
#
126+
test_config gc.auto 0 &&
127+
#
126128
test_commit -C "$REPO_SRC" file1.txt &&
127129
test_commit -C "$REPO_SRC" file2.txt &&
128130
test_commit -C "$REPO_SRC" file3.txt &&
@@ -288,7 +290,7 @@ verify_connection_count () {
288290
expected_nr=1
289291
fi
290292

291-
actual_nr=$(( $(grep "Connection from" "$SERVER_LOG" | wc -l) ))
293+
actual_nr=$(grep -c "Connection from" "$SERVER_LOG")
292294

293295
if test $actual_nr -ne $expected_nr
294296
then
@@ -339,7 +341,7 @@ verify_received_packfile_count () {
339341
expected_nr=1
340342
fi
341343

342-
actual_nr=$(( $(grep "packfile " OUT.output | wc -l) ))
344+
actual_nr=$(grep -c "packfile " <OUT.output)
343345

344346
if test $actual_nr -ne $expected_nr
345347
then

0 commit comments

Comments
 (0)