git-whence 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10de9d0d61af77edf2f36e586fe91ec33693648
-  data.tar.gz: 381164b5f26998b6f6e3c665666f4f653425fe5a
+  metadata.gz: 7086aa5c3bbc94e5f5a842c43e88669ded5738b5
+  data.tar.gz: 0e22874dd8b2ec5d8e628ab18c72f453beb65044
 SHA512:
-  metadata.gz: 171d8e85b32587b9077c83dcaca460918d196ce22f0e206ed2e821c132b53d028d9b4a9a3a3eee1e40f88476bf0c5f2bcde3204886ffedd9573f0da4c1decfe3
-  data.tar.gz: 2b1f4de02c903ab33576369f88889fdeb69c073c0d174f3021923d44fb77d6c94a6a8815866bf84221b30e9b1314f489bfc4a8d9d7ab10999c01858f98839f23
+  metadata.gz: 2bcfce0b66afbac623de6721ab12b0025f1742bc0cafe6c23ce2cead5ef26ad6c912effdaff3d29ffd879bc63eba3321707b68ea9482dc5a22b2e82b30b03179
+  data.tar.gz: bdd79fe9fe66d32b94bebfce7e792635c12ff12db101397065a08bba1578b4b7cb8e36f42b5246871575bde9b7959f319bfee873acc590ebccd827ab6b760fe4

data.tar.gz.sig

@@ -1,3 +1 @@
-4(_%�5�c���[�����S3m��pcg�RL�9��w�r�&N8�Dj�4z�<��= �����A�0�$����-�m�&F��\S%Q�KT�u�G]���]-6�ӧ�Ҟ�/n�h�b�偁�r�����Ǭ�X�h��\��ڝ����@�����F]ah@N
�/�U#o��bOA���� �GxDRE���	�z�^����FI�QI�^gkeDV?��J�,
-e�b�8u�/���ӹ�����
-�z)��.
+Ƃ����*�}���4E"�L3�i���͉�C����<��LE΃B*��S����J�ϓrT����J�7��~F-!�5�#��/m!��=��C��-��i���zX��2���g ����zѐ����ߑ1Y�
1{�H��LŝԻZ���)`�q+u:�FQ}G�1z�d�v��E�:�v��%4o�����N�Ƒ��s�(��b%��/7�t���])Y

data/lib/git/whence.rb

@@ -12,6 +12,8 @@ module Git::Whence
           return 1
         end
 
+        commit = expand(commit)
+
         if is_merge?(commit)
           $stderr.puts "Commit is a merge"
           finished_with_commit(commit, options)
@@ -30,6 +32,10 @@ module Git::Whence
 
       private
 
+      def expand(commit)
+        sh("git show #{commit} -s --format='%H'").strip
+      end
+
       def is_merge?(commit)
         sh("git cat-file -p #{commit}").split("\n")[1..2].grep(/parent /).size > 1
       end
@@ -58,8 +64,8 @@ module Git::Whence
       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)
+        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,13 +78,13 @@ module Git::Whence
         month = 30 * 24 * 60 * 60
         time, search = sh("git show -s --format='%ct %an %s' #{commit}").strip.split(" ", 2)
         time = time.to_i
-        same = sh("git log #{branch} --pretty=format:'%h %an %s' --before #{time + month} --after #{time - month}")
+        same = sh("git log #{branch} --pretty=format:'%H %an %s' --before #{time + month} --after #{time - month}")
         found = same.split("\n").map { |x| x.split(" ", 2) }.detect { |commit, message| message == search }
         found && found.first
       end
 
       def find_merge_simple(commit, branch)
-        result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%h' 2>/dev/null | tail -n 1"
+        result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%H' 2>/dev/null | tail -n 1"
         [commit, result] unless result.strip.empty?
       end
 

data/lib/git/whence/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-07-03 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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks