Merge branch 'js/fmt-patch' into next

diff --git a/git-applypatch.sh b/git-applypatch.sh
index a112e1a50405c733e9e94c610caf36a7b07297dd..12cab1e0d4ceb1f1c58c418f96358b252713bf58 100755 (executable)
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -10,8 +10,12 @@
 ##     $3 - "info" file with Author, email and subject
 ##     $4 - optional file containing signoff to add
 ##
+
+USAGE='<msg> <patch> <info> [<signoff>]'
 . git-sh-setup
 
+case "$#" in 3|4) ;; *) usage ;; esac
+
 final=.dotest/final-commit
 ##
 ## If this file exists, we ask before applying