Merge branches 'lh/submodules' and 'pb/am'

diff --git a/templates/hooks--applypatch-msg b/templates/hooks--applypatch-msg
index bda3c86be732b5fae98291f8fadd76b916fde5ed..02de1ef84c9b8c2c2659048269784ee8cfd1bbb5 100644 (file)
--- a/templates/hooks--applypatch-msg
+++ b/templates/hooks--applypatch-msg
@@ -9,6 +9,7 @@
 #
 # To enable this hook, make this file executable.
 
+. git-sh-setup
 test -x "$GIT_DIR/hooks/commit-msg" &&
        exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
 :