From 9e0bfa722ef0b9eb34586e1d864e840c74a2922d Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Fri, 20 Apr 2012 14:52:57 -0400
Subject: [PATCH] oops

---
 lib/penchant/version.rb          |  2 +-
 script/hooks/commit-msg          |  8 --------
 template/script/hooks/commit-msg | 10 ++--------
 template/script/hooks/pre-commit |  5 ++++-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/penchant/version.rb b/lib/penchant/version.rb
index aef3d78..b545099 100644
--- a/lib/penchant/version.rb
+++ b/lib/penchant/version.rb
@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.1.2"
+  VERSION = "0.1.2.1"
 end
diff --git a/script/hooks/commit-msg b/script/hooks/commit-msg
index 786f49a..1b1c32a 100755
--- a/script/hooks/commit-msg
+++ b/script/hooks/commit-msg
@@ -14,11 +14,3 @@ if [[ "${msg}" != *"[ci skip]"* ]]; then
   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
-
-exit 0
diff --git a/template/script/hooks/commit-msg b/template/script/hooks/commit-msg
index 786f49a..d3f37c8 100755
--- a/template/script/hooks/commit-msg
+++ b/template/script/hooks/commit-msg
@@ -6,7 +6,9 @@ OLD_GIT_DIR=$GIT_DIR
 
 if [[ "${msg}" != *"[ci skip]"* ]]; then
   if [ "$(penchant gemfile-env)" != "remote" ]; then
+    unset GIT_DIR
     penchant gemfile remote
+    GIT_DIR=$OLD_GIT_DIR
   fi
 
   bundle exec rake
@@ -14,11 +16,3 @@ if [[ "${msg}" != *"[ci skip]"* ]]; then
   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
-
-exit 0
diff --git a/template/script/hooks/pre-commit b/template/script/hooks/pre-commit
index 8cfef3d..a3a5af7 100755
--- a/template/script/hooks/pre-commit
+++ b/template/script/hooks/pre-commit
@@ -1,4 +1,7 @@
 #!/bin/bash
 
-# this has been moved to commit-msg
+unset GIT_DIR
+penchant gemfile remote --deployment
+GIT_DIR=$OLD_GIT_DIR
+git add Gemfile*