Merge branch 'master' into lt/apply

diff --git a/git-applypatch.sh b/git-applypatch.sh
index 214f5c31a6020ae63b4fee3c245156717d536252..12cab1e0d4ceb1f1c58c418f96358b252713bf58 100755 (executable)
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -14,7 +14,7 @@
 USAGE='<msg> <patch> <info> [<signoff>]'
 . git-sh-setup
 
-[[ "$#" = "3" || "$#" = "4" ]] || usage
+case "$#" in 3|4) ;; *) usage ;; esac
 
 final=.dotest/final-commit
 ##