Merge branch 'jl/test-lint-scripts'

diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index e80155c2687d6f785b2c05c87304037494bf0e19..934505bab9e6cf04a3536010ac31b1795c852c9f 100755 (executable)
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -51,7 +51,7 @@ run_status () {
                export GIT_INDEX_FILE
        fi
 
-       if test "$status_only" = "t" -o "$use_status_color" = "t"; then
+       if test "$status_only" = "t" || test "$use_status_color" = "t"; then
                color=
        else
                color=--nocolor
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
 0,,,*)
        ;;
 *,,,*)
-       only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+       only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
        also=
        ;;
 esac
@@ -296,7 +296,7 @@ t,,,[1-9]*)
        die "No paths with -i does not make sense." ;;
 esac
 
-if test ! -z "$templatefile" -a -z "$log_given"
+if test ! -z "$templatefile" && test -z "$log_given"
 then
        if test ! -f "$templatefile"
        then