overcommit 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c50bccbcc41b00a198c3204913170541cf86221
-  data.tar.gz: 98934cdbb33a1b9b9fd86a1cacdd440cbc91086a
+  metadata.gz: 2aebb6ab71945c02062f371523a8eea70e426379
+  data.tar.gz: d767537a9df14218b77ca816f7052e5919d4edae
 SHA512:
-  metadata.gz: 4ee6a86eb6075f5a5eb966edd92de95084c32c53ec9ad87c8fe5c90fb20782195fd64f1fa58a77b9142cf66c12412863f607b68912e670720918878fc3d4e182
-  data.tar.gz: 234dccc7f9ca2a0a8b02a2594b93a6a3fa5bcb2a082152f91150d4a0382c294e474692e4a257ae1617f211464885da5bde0071a0326e7783a4ce1b7978b48087
+  metadata.gz: f167631135213cc30d439e469b3d53a40a48aa9c67d845062ff34884db8306764a9c15d54a326e27211124dc7a579ef31567ce03e5d38aaafc284e81de61a69f
+  data.tar.gz: 03a5d3bd2062ba1c1757383559dab5b1052ceb34793d299aa11f7d91723dc182cda515ca48e999662e3779dd15a16d82c4f70bf435150f091d224158c06df6a0

data/lib/overcommit/hook_context/pre_commit.rb

@@ -12,6 +12,7 @@ module Overcommit::HookContext
     def setup_environment
       store_modified_times
       store_merge_state
+      store_cherry_pick_state
 
       if any_changes?
         @changes_stashed = true
@@ -34,6 +35,7 @@ module Overcommit::HookContext
       end
 
       restore_merge_state
+      restore_cherry_pick_state
       restore_modified_times
     end
 
@@ -99,6 +101,16 @@ module Overcommit::HookContext
       end
     end
 
+    def store_cherry_pick_state
+      cherry_head = `git rev-parse CHERRY_PICK_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 cherry_head != 'CHERRY_PICK_HEAD'
+        @cherry_head = cherry_head
+      end
+    end
+
     def restore_merge_state
       if @merge_head
         FileUtils.touch(File.expand_path('.git/MERGE_MODE', Overcommit::Utils.repo_root))
@@ -117,6 +129,16 @@ module Overcommit::HookContext
       end
     end
 
+    def restore_cherry_pick_state
+      if @cherry_head
+        File.open(File.expand_path('.git/CHERRY_PICK_HEAD',
+                                   Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@cherry_head}\n")
+        end
+        @cherry_head = 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.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -57,14 +57,14 @@ dependencies:
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: Utility to install, configure, and extend Git hooks
@@ -80,69 +80,69 @@ files:
 - config/default.yml
 - config/templates.yml
 - lib/overcommit.rb
-- lib/overcommit/cli.rb
-- lib/overcommit/configuration.rb
-- lib/overcommit/configuration_loader.rb
+- lib/overcommit/version.rb
+- lib/overcommit/hook_context.rb
 - lib/overcommit/constants.rb
-- lib/overcommit/exceptions.rb
-- lib/overcommit/hook/base.rb
-- lib/overcommit/hook/commit_msg/base.rb
+- lib/overcommit/utils.rb
+- lib/overcommit/hook_runner.rb
+- lib/overcommit/user_input.rb
+- lib/overcommit/subprocess.rb
+- lib/overcommit/hook/commit_msg/trailing_period.rb
 - lib/overcommit/hook/commit_msg/gerrit_change_id.rb
-- lib/overcommit/hook/commit_msg/hard_tabs.rb
-- lib/overcommit/hook/commit_msg/russian_novel.rb
 - lib/overcommit/hook/commit_msg/single_line_subject.rb
+- lib/overcommit/hook/commit_msg/russian_novel.rb
+- lib/overcommit/hook/commit_msg/hard_tabs.rb
 - lib/overcommit/hook/commit_msg/text_width.rb
-- lib/overcommit/hook/commit_msg/trailing_period.rb
-- lib/overcommit/hook/post_checkout/base.rb
+- lib/overcommit/hook/commit_msg/base.rb
 - lib/overcommit/hook/post_checkout/bundle_check.rb
 - lib/overcommit/hook/post_checkout/index_tags.rb
+- lib/overcommit/hook/post_checkout/base.rb
+- lib/overcommit/hook/base.rb
 - lib/overcommit/hook/pre_commit/author_email.rb
-- lib/overcommit/hook/pre_commit/author_name.rb
-- lib/overcommit/hook/pre_commit/base.rb
-- lib/overcommit/hook/pre_commit/berksfile_check.rb
-- lib/overcommit/hook/pre_commit/brakeman.rb
-- lib/overcommit/hook/pre_commit/bundle_check.rb
-- lib/overcommit/hook/pre_commit/chamber_security.rb
-- lib/overcommit/hook/pre_commit/coffee_lint.rb
-- lib/overcommit/hook/pre_commit/css_lint.rb
-- lib/overcommit/hook/pre_commit/haml_lint.rb
-- lib/overcommit/hook/pre_commit/hard_tabs.rb
+- lib/overcommit/hook/pre_commit/pry_binding.rb
 - lib/overcommit/hook/pre_commit/image_optim.rb
-- lib/overcommit/hook/pre_commit/js_hint.rb
-- lib/overcommit/hook/pre_commit/jscs.rb
-- lib/overcommit/hook/pre_commit/json_syntax.rb
+- lib/overcommit/hook/pre_commit/css_lint.rb
 - lib/overcommit/hook/pre_commit/jsx_hint.rb
 - lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
-- lib/overcommit/hook/pre_commit/merge_conflicts.rb
-- lib/overcommit/hook/pre_commit/pry_binding.rb
-- lib/overcommit/hook/pre_commit/python_flake8.rb
+- lib/overcommit/hook/pre_commit/travis_lint.rb
+- lib/overcommit/hook/pre_commit/bundle_check.rb
+- lib/overcommit/hook/pre_commit/yaml_syntax.rb
 - lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+- lib/overcommit/hook/pre_commit/berksfile_check.rb
+- lib/overcommit/hook/pre_commit/merge_conflicts.rb
+- lib/overcommit/hook/pre_commit/trailing_whitespace.rb
+- lib/overcommit/hook/pre_commit/author_name.rb
 - lib/overcommit/hook/pre_commit/rubocop.rb
+- lib/overcommit/hook/pre_commit/python_flake8.rb
+- lib/overcommit/hook/pre_commit/js_hint.rb
+- lib/overcommit/hook/pre_commit/chamber_security.rb
+- lib/overcommit/hook/pre_commit/hard_tabs.rb
+- lib/overcommit/hook/pre_commit/haml_lint.rb
+- lib/overcommit/hook/pre_commit/coffee_lint.rb
+- lib/overcommit/hook/pre_commit/brakeman.rb
+- lib/overcommit/hook/pre_commit/jscs.rb
 - lib/overcommit/hook/pre_commit/scss_lint.rb
-- lib/overcommit/hook/pre_commit/trailing_whitespace.rb
-- lib/overcommit/hook/pre_commit/travis_lint.rb
-- lib/overcommit/hook/pre_commit/yaml_syntax.rb
-- lib/overcommit/hook_context.rb
-- lib/overcommit/hook_context/base.rb
+- lib/overcommit/hook/pre_commit/base.rb
+- lib/overcommit/hook/pre_commit/json_syntax.rb
+- lib/overcommit/hook_signer.rb
+- lib/overcommit/hook_context/pre_commit.rb
 - lib/overcommit/hook_context/commit_msg.rb
+- lib/overcommit/hook_context/base.rb
 - lib/overcommit/hook_context/post_checkout.rb
-- lib/overcommit/hook_context/pre_commit.rb
-- lib/overcommit/hook_loader/base.rb
+- lib/overcommit/installer.rb
+- lib/overcommit/configuration_loader.rb
 - lib/overcommit/hook_loader/built_in_hook_loader.rb
 - lib/overcommit/hook_loader/plugin_hook_loader.rb
-- lib/overcommit/hook_runner.rb
-- lib/overcommit/hook_signer.rb
-- lib/overcommit/installer.rb
+- lib/overcommit/hook_loader/base.rb
+- lib/overcommit/exceptions.rb
+- lib/overcommit/configuration.rb
 - lib/overcommit/logger.rb
-- lib/overcommit/subprocess.rb
-- lib/overcommit/user_input.rb
-- lib/overcommit/utils.rb
-- lib/overcommit/version.rb
-- libexec/gerrit-change-id
+- lib/overcommit/cli.rb
 - libexec/index-tags
+- libexec/gerrit-change-id
 - template-dir/hooks/commit-msg
-- template-dir/hooks/overcommit-hook
 - template-dir/hooks/post-checkout
+- template-dir/hooks/overcommit-hook
 - template-dir/hooks/pre-commit
 homepage: https://github.com/causes/overcommit
 licenses:
@@ -155,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Git hook manager