overcommit 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85ad2d80c2da4defeec5bce808514385a27c6e6
-  data.tar.gz: e547ff585ce285436624840c7b16e32ab79677a7
+  metadata.gz: c401b4037c6c90452c248dfaca8cacbd549179eb
+  data.tar.gz: 0dd31cd371594e594acf9a4801c35de6a86501fb
 SHA512:
-  metadata.gz: 5e7633bf2eccb141b29a8b0bb69910ceb3810badc570a9573f3a6ce069988af8a436ee7b91f2802bf8f305be92aac98c1f603d9570690f7bad5ecae4bf6bff5c
-  data.tar.gz: 5988d0a37ca6bf001019e94c19e11e97aeb52cc1bec66e75478d1c5bb04f231c43f77447702b579c3a468d9248c6515d62fa28337b93cd92725e33b47eec665b
+  metadata.gz: 87a27a2be76870493529d9f66bd518107c6bc3cfeb039801075da2d89c8d50b603c8245f871d0ceae26b9ef2b2aeb87c9b77eaad7c71548d0686e282ca17b882
+  data.tar.gz: b40a66a5f76dd54b234940370411f5dec3bc8061efe8a5c4c2dd85493f19ab350687605dab2a634fb72a183b8bfe6682484119ea9ba5f5bdb0430270995d0e80

data/lib/overcommit/hook/base.rb

@@ -70,22 +70,17 @@ module Overcommit::Hook
     def applicable_file?(file)
       includes = Array(@config['include']).map { |glob| convert_glob_to_absolute(glob) }
       included = includes.empty? ||
-                 includes.any? { |glob| File.fnmatch(glob, file) }
+                 includes.any? { |glob| Dir[glob].include?(file) }
 
       excludes = Array(@config['exclude']).map { |glob| convert_glob_to_absolute(glob) }
-      excluded = excludes.any? { |glob| File.fnmatch(glob, file) }
+      excluded = excludes.any? { |glob| Dir[glob].include?(file) }
 
       included && !excluded
     end
 
     def convert_glob_to_absolute(glob)
       repo_root = Overcommit::Utils.repo_root
-
-      if glob.start_with?('**')
-        repo_root + glob # Want ** to match items in the repo root as well
-      else
-        File.join(repo_root, glob)
-      end
+      File.join(repo_root, glob)
     end
   end
 end

data/lib/overcommit/hook/post_checkout/bundle_check.rb

@@ -22,7 +22,7 @@ module Overcommit::Hook::PostCheckout
       result = execute(%w[git diff --exit-code --name-only] + [new_head, previous_head])
 
       result.stdout.split("\n").any? do |file|
-        Array(@config['include']).any? { |glob| File.fnmatch(glob, file) }
+        Array(@config['include']).any? { |glob| Dir[glob].include?(file) }
       end
     end
 

data/lib/overcommit/hook_context/pre_commit.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'set'
 
 module Overcommit::HookContext
@@ -10,6 +11,7 @@ module Overcommit::HookContext
     # about to be committed.
     def setup_environment
       store_modified_times
+      store_merge_state
 
       if any_changes?
         @changes_stashed = true
@@ -28,9 +30,10 @@ module Overcommit::HookContext
       `git reset --hard` # Ensure working tree is clean before popping stash
 
       if @changes_stashed
-        `git stash pop --index --quiet`
+        `git stash apply --index --quiet`
       end
 
+      restore_merge_state
       restore_modified_times
     end
 
@@ -83,6 +86,37 @@ module Overcommit::HookContext
       lines
     end
 
+    def store_merge_state
+      merge_head = `git rev-parse MERGE_HEAD 2> /dev/null`.chomp
+
+      # Store the merge state if we're in the middle of resolving a merge
+      # conflict. This is necessary since stashing removes the merge state.
+      if merge_head != 'MERGE_HEAD'
+        @merge_head = merge_head
+
+        merge_msg_file = File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root)
+        @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
+      end
+    end
+
+    def restore_merge_state
+      if @merge_head
+        FileUtils.touch(File.expand_path('.git/MERGE_MODE', Overcommit::Utils.repo_root))
+
+        File.open(File.expand_path('.git/MERGE_HEAD', Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@merge_head}\n")
+        end
+        @merge_head = nil
+      end
+
+      if @merge_msg
+        File.open(File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@merge_msg}\n")
+        end
+        @merge_msg = nil
+      end
+    end
+
     def store_modified_times
       @modified_times = {}
 

data/lib/overcommit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess