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 <gitster@pobox.com>

diff --git a/t/lib-t6000.sh b/t/lib-t6000.sh
index ea25dd89e505525507c16c62d91fb07c092b064a..102d5678151d5b1fcca731724efb2bd1ad0647d6 100644 (file)
--- a/t/lib-t6000.sh
+++ b/t/lib-t6000.sh
@@ -1,55 +1,50 @@
 : included from 6002 and others
 
 : included from 6002 and others
 

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

 
 

-:> sed.script
+>sed.script

 
 

-# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags
-tag()
-{
+# Answer the sha1 has associated with the tag. The tag must exist in .git/refs/tags
+tag () {

        _tag=$1
        _tag=$1

-       [ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist"
-       cat .git/refs/tags/$_tag
+       test -f ".git/refs/tags/$_tag" || error "tag: \"$_tag\" does not exist"
+       cat ".git/refs/tags/$_tag"

 }
 
 # Generate a commit using the text specified to make it unique and the tree
 # named by the tag specified.
 }
 
 # Generate a commit using the text specified to make it unique and the tree
 # named by the tag specified.

-unique_commit()
-{
+unique_commit () {

        _text=$1
        _text=$1

-        _tree=$2
+       _tree=$2

        shift 2
        shift 2

-       echo $_text | git commit-tree $(tag $_tree) "$@"
+       echo "$_text" | git commit-tree $(tag "$_tree") "$@"

 }
 
 # Save the output of a command into the tag specified. Prepend
 # a substitution script for the tag onto the front of sed.script
 }
 
 # Save the output of a command into the tag specified. Prepend
 # a substitution script for the tag onto the front of sed.script

-save_tag()
-{
+save_tag () {

        _tag=$1
        _tag=$1

-       [ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
+       test -n "$_tag" || error "usage: save_tag tag commit-args ..."

        shift 1
        shift 1

-       "$@" >.git/refs/tags/$_tag
+       "$@" >".git/refs/tags/$_tag"

 
 

-        echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
-       cat sed.script >> sed.script.tmp
+       echo "s/$(tag $_tag)/$_tag/g" >sed.script.tmp
+       cat sed.script >>sed.script.tmp

        rm sed.script
        mv sed.script.tmp sed.script
 }
 
 # Replace unhelpful sha1 hashses with their symbolic equivalents
        rm sed.script
        mv sed.script.tmp sed.script
 }
 
 # Replace unhelpful sha1 hashses with their symbolic equivalents

-entag()
-{
+entag () {

        sed -f sed.script
 }
 
 # Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL
 # tag to a specified value. Restore the original value on return.
        sed -f sed.script
 }
 
 # Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL
 # tag to a specified value. Restore the original value on return.

-as_author()
-{
+as_author () {

        _author=$1
        shift 1
        _author=$1
        shift 1

-        _save=$GIT_AUTHOR_EMAIL
+       _save=$GIT_AUTHOR_EMAIL

 
        GIT_AUTHOR_EMAIL="$_author"
        export GIT_AUTHOR_EMAIL
 
        GIT_AUTHOR_EMAIL="$_author"
        export GIT_AUTHOR_EMAIL


@@ -63,45 +58,41 @@ as_author()
        fi
 }
 
        fi
 }
 

-commit_date()
-{
-        _commit=$1
-       git cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
+commit_date () {
+       _commit=$1
+       git cat-file commit $_commit |
+       sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"

 }
 
 }
 

-on_committer_date()
-{
-    _date=$1
-    shift 1
-    GIT_COMMITTER_DATE="$_date"
-    export GIT_COMMITTER_DATE
-    "$@"
-    unset GIT_COMMITTER_DATE
+on_committer_date () {
+       _date=$1
+       shift 1
+       GIT_COMMITTER_DATE="$_date"
+       export GIT_COMMITTER_DATE
+       "$@"
+       unset GIT_COMMITTER_DATE

 }
 
 # Execute a command and suppress any error output.
 }
 
 # Execute a command and suppress any error output.

-hide_error()
-{
+hide_error () {

        "$@" 2>/dev/null
 }
 
        "$@" 2>/dev/null
 }
 

-check_output()
-{
+check_output () {

        _name=$1
        shift 1
        _name=$1
        shift 1

-       if eval "$*" | entag > $_name.actual
+       if eval "$*" | entag >"$_name.actual"

        then
        then

-               test_cmp $_name.expected $_name.actual
+               test_cmp "$_name.expected" "$_name.actual"

        else
        else

-               return 1;
+               return 1

        fi
 }
 
 # Turn a reasonable test description into a reasonable test name.
 # All alphanums translated into -'s which are then compressed and stripped
 # from front and back.
        fi
 }
 
 # Turn a reasonable test description into a reasonable test name.
 # All alphanums translated into -'s which are then compressed and stripped
 # from front and back.

-name_from_description()
-{
+name_from_description () {

        perl -pe '
                s/[^A-Za-z0-9.]/-/g;
                s/-+/-/g;
        perl -pe '
                s/[^A-Za-z0-9.]/-/g;
                s/-+/-/g;


@@ -119,9 +110,11 @@ name_from_description()
 test_output_expect_success()
 {
        _description=$1
 test_output_expect_success()
 {
        _description=$1

-        _test=$2
-        [ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
-        _name=$(echo $_description | name_from_description)
-       cat > $_name.expected
+       _test=$2
+       test $# -eq 2 ||
+       error "usage: test_output_expect_success description test <<EOF ... EOF"
+
+       _name=$(echo $_description | name_from_description)
+       cat >"$_name.expected"

        test_expect_success "$_description" "check_output $_name \"$_test\""
 }
        test_expect_success "$_description" "check_output $_name \"$_test\""
 }