gitty 0.3.0 → 0.3.1

data/assets/helpers/hookd_wrapper

@@ -10,7 +10,7 @@ remote_branch=$(git show-ref origin/--hooks--)
   [ "${remote_branch%% *}" != "$local_rev" ] && (
     echo "Hook updates were applied:" 1>&2
     GIT_OBJECT_DIRECTORY=../../objects git branch origin/--hooks-- ${remote_branch%% *} -f 1>&2
-    GIT_OBJECT_DIRECTORY=../../objects git reset --hard ${remote_branch%% *} 1>&2
+    GIT_OBJECT_DIRECTORY=../../objects git merge ${remote_branch%% *} 1>&2
   )
 )
   

data/bin/git-hook

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-$: << File.dirname(__FILE__) + "/../lib/"
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
 require "gitty"
 Gitty::HookCommand.new(ARGV).run

data/lib/gitty/commands/init.rb

@@ -34,7 +34,8 @@ class Gitty::HookCommand::Init < Gitty::Runner
           cmd(*%w[git symbolic-ref HEAD refs/heads/--hooks--])
           cmd(*%w[git commit --allow-empty -m initial\ commit])
         end
-        cmd(*%w[git reset --hard] + hooks_rev) if hooks_rev
+        cmd("git reset --hard #{hooks_rev}") if hooks_rev
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitty
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tim Harper