Skip to content

Commit 50e5a25

Browse files
committed
t/lib-t6000: style fixes
Mostly fixes to initial indentation with 8-SP (they should be HT) and wrapping long lines. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 81c6b38 commit 50e5a25

File tree

1 file changed

+40
-47
lines changed

1 file changed

+40
-47
lines changed

t/lib-t6000.sh

Lines changed: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,50 @@
11
: included from 6002 and others
22

3-
[ -d .git/refs/tags ] || mkdir -p .git/refs/tags
3+
mkdir -p .git/refs/tags
44

5-
:> sed.script
5+
>sed.script
66

7-
# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags
8-
tag()
9-
{
7+
# Answer the sha1 has associated with the tag. The tag must exist in .git/refs/tags
8+
tag () {
109
_tag=$1
11-
[ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist"
12-
cat .git/refs/tags/$_tag
10+
test -f ".git/refs/tags/$_tag" || error "tag: \"$_tag\" does not exist"
11+
cat ".git/refs/tags/$_tag"
1312
}
1413

1514
# Generate a commit using the text specified to make it unique and the tree
1615
# named by the tag specified.
17-
unique_commit()
18-
{
16+
unique_commit () {
1917
_text=$1
20-
_tree=$2
18+
_tree=$2
2119
shift 2
22-
echo $_text | git commit-tree $(tag $_tree) "$@"
20+
echo "$_text" | git commit-tree $(tag "$_tree") "$@"
2321
}
2422

2523
# Save the output of a command into the tag specified. Prepend
2624
# a substitution script for the tag onto the front of sed.script
27-
save_tag()
28-
{
25+
save_tag () {
2926
_tag=$1
30-
[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
27+
test -n "$_tag" || error "usage: save_tag tag commit-args ..."
3128
shift 1
32-
"$@" >.git/refs/tags/$_tag
29+
"$@" >".git/refs/tags/$_tag"
3330

34-
echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
35-
cat sed.script >> sed.script.tmp
31+
echo "s/$(tag $_tag)/$_tag/g" >sed.script.tmp
32+
cat sed.script >>sed.script.tmp
3633
rm sed.script
3734
mv sed.script.tmp sed.script
3835
}
3936

4037
# Replace unhelpful sha1 hashses with their symbolic equivalents
41-
entag()
42-
{
38+
entag () {
4339
sed -f sed.script
4440
}
4541

4642
# Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL
4743
# tag to a specified value. Restore the original value on return.
48-
as_author()
49-
{
44+
as_author () {
5045
_author=$1
5146
shift 1
52-
_save=$GIT_AUTHOR_EMAIL
47+
_save=$GIT_AUTHOR_EMAIL
5348

5449
GIT_AUTHOR_EMAIL="$_author"
5550
export GIT_AUTHOR_EMAIL
@@ -63,45 +58,41 @@ as_author()
6358
fi
6459
}
6560

66-
commit_date()
67-
{
68-
_commit=$1
69-
git cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
61+
commit_date () {
62+
_commit=$1
63+
git cat-file commit $_commit |
64+
sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
7065
}
7166

72-
on_committer_date()
73-
{
74-
_date=$1
75-
shift 1
76-
GIT_COMMITTER_DATE="$_date"
77-
export GIT_COMMITTER_DATE
78-
"$@"
79-
unset GIT_COMMITTER_DATE
67+
on_committer_date () {
68+
_date=$1
69+
shift 1
70+
GIT_COMMITTER_DATE="$_date"
71+
export GIT_COMMITTER_DATE
72+
"$@"
73+
unset GIT_COMMITTER_DATE
8074
}
8175

8276
# Execute a command and suppress any error output.
83-
hide_error()
84-
{
77+
hide_error () {
8578
"$@" 2>/dev/null
8679
}
8780

88-
check_output()
89-
{
81+
check_output () {
9082
_name=$1
9183
shift 1
92-
if eval "$*" | entag > $_name.actual
84+
if eval "$*" | entag >"$_name.actual"
9385
then
94-
test_cmp $_name.expected $_name.actual
86+
test_cmp "$_name.expected" "$_name.actual"
9587
else
96-
return 1;
88+
return 1
9789
fi
9890
}
9991

10092
# Turn a reasonable test description into a reasonable test name.
10193
# All alphanums translated into -'s which are then compressed and stripped
10294
# from front and back.
103-
name_from_description()
104-
{
95+
name_from_description () {
10596
perl -pe '
10697
s/[^A-Za-z0-9.]/-/g;
10798
s/-+/-/g;
@@ -119,9 +110,11 @@ name_from_description()
119110
test_output_expect_success()
120111
{
121112
_description=$1
122-
_test=$2
123-
[ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
124-
_name=$(echo $_description | name_from_description)
125-
cat > $_name.expected
113+
_test=$2
114+
test $# -eq 2 ||
115+
error "usage: test_output_expect_success description test <<EOF ... EOF"
116+
117+
_name=$(echo $_description | name_from_description)
118+
cat >"$_name.expected"
126119
test_expect_success "$_description" "check_output $_name \"$_test\""
127120
}

0 commit comments

Comments
 (0)