oops

template/script/hooks/commit-msg

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+msg=$(cat $1)
+
+OLD_GIT_DIR=$GIT_DIR
+
+if [[ "${msg}" != *"[ci skip]"* ]]; then
+  if [ "$(penchant gemfile-env)" != "remote" ]; then
+    penchant gemfile remote
+  fi
+
+  bundle exec rake
+  R=$?
+  if [ $R -ne 0 ]; then exit $R; fi
+fi
+
+if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
+  unset GIT_DIR
+  penchant gemfile remote --deployment
+  GIT_DIR=$OLD_GIT_DIR
+  git add Gemfile*
+fi
+
+

template/script/hooks/pre-commit

@@ -1,19 +1,4 @@
 #!/bin/bash
 
-OLD_GIT_DIR=$GIT_DIR
+# this has been moved to commit-msg
-
-if [ "$(penchant gemfile-env)" != "remote" ]; then
-  penchant gemfile remote
-fi
-
-bundle exec rake
-R=$?
-if [ $R -ne 0 ]; then exit $R; fi
-
-if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
-  unset GIT_DIR
-  penchant gemfile remote --deployment
-  GIT_DIR=$OLD_GIT_DIR
-  git add Gemfile*
-fi