git-whence 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d23b4ac84ee717b785cd7de075b1a2d035509e5
-  data.tar.gz: d7b37d818091f7abeaa0833f83d26a780c140b66
+  metadata.gz: e10de9d0d61af77edf2f36e586fe91ec33693648
+  data.tar.gz: 381164b5f26998b6f6e3c665666f4f653425fe5a
 SHA512:
-  metadata.gz: d357a86878294eaebddc58f3b21d7e53665260c744396325ee1ef056ce4b7b612c9a2bdd51d995fae61bb5fb620639f474b12e9b2c866ac300e9c5285b6d8c5a
-  data.tar.gz: c069e55bb44efa2c09aa52b48c9bcd74b2972421d6f477d709ab0ded902331b90db2ed97582b1d2473bd582ef6ddcb3d965870e7a89ce8dddb54bfcc8cc3e7c2
+  metadata.gz: 171d8e85b32587b9077c83dcaca460918d196ce22f0e206ed2e821c132b53d028d9b4a9a3a3eee1e40f88476bf0c5f2bcde3204886ffedd9573f0da4c1decfe3
+  data.tar.gz: 2b1f4de02c903ab33576369f88889fdeb69c073c0d174f3021923d44fb77d6c94a6a8815866bf84221b30e9b1314f489bfc4a8d9d7ab10999c01858f98839f23

data/lib/git/whence.rb

@@ -50,9 +50,16 @@ module Git::Whence
       end
 
       def find_merge(commit)
-        find_merge_simple(commit, "HEAD") ||
+        commit, merge = find_merge_simple(commit, "HEAD") ||
           find_merge_simple(commit, "master") ||
           find_merge_fuzzy(commit, "master")
+
+        merge if merge && merge_include_commit?(merge, commit)
+      end
+
+      def merge_include_commit?(merge, commit)
+        commit = sh("git show HEAD -s --format=%h").strip if commit == "HEAD"
+        sh("git log #{merge.strip}^..#{merge.strip} --pretty=%h").split("\n").include?(commit)
       end
 
       def find_merge_fuzzy(commit, branch)
@@ -72,7 +79,7 @@ module Git::Whence
 
       def find_merge_simple(commit, branch)
         result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%h' 2>/dev/null | tail -n 1"
-        result unless result.strip.empty?
+        [commit, result] unless result.strip.empty?
       end
 
       def sh(command)

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -53,17 +53,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks