git-whence 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3d23b4ac84ee717b785cd7de075b1a2d035509e5
4
- data.tar.gz: d7b37d818091f7abeaa0833f83d26a780c140b66
3
+ metadata.gz: e10de9d0d61af77edf2f36e586fe91ec33693648
4
+ data.tar.gz: 381164b5f26998b6f6e3c665666f4f653425fe5a
5
5
  SHA512:
6
- metadata.gz: d357a86878294eaebddc58f3b21d7e53665260c744396325ee1ef056ce4b7b612c9a2bdd51d995fae61bb5fb620639f474b12e9b2c866ac300e9c5285b6d8c5a
7
- data.tar.gz: c069e55bb44efa2c09aa52b48c9bcd74b2972421d6f477d709ab0ded902331b90db2ed97582b1d2473bd582ef6ddcb3d965870e7a89ce8dddb54bfcc8cc3e7c2
6
+ metadata.gz: 171d8e85b32587b9077c83dcaca460918d196ce22f0e206ed2e821c132b53d028d9b4a9a3a3eee1e40f88476bf0c5f2bcde3204886ffedd9573f0da4c1decfe3
7
+ data.tar.gz: 2b1f4de02c903ab33576369f88889fdeb69c073c0d174f3021923d44fb77d6c94a6a8815866bf84221b30e9b1314f489bfc4a8d9d7ab10999c01858f98839f23
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/git/whence.rb CHANGED
@@ -50,9 +50,16 @@ module Git::Whence
50
50
  end
51
51
 
52
52
  def find_merge(commit)
53
- find_merge_simple(commit, "HEAD") ||
53
+ commit, merge = find_merge_simple(commit, "HEAD") ||
54
54
  find_merge_simple(commit, "master") ||
55
55
  find_merge_fuzzy(commit, "master")
56
+
57
+ merge if merge && merge_include_commit?(merge, commit)
58
+ end
59
+
60
+ def merge_include_commit?(merge, commit)
61
+ commit = sh("git show HEAD -s --format=%h").strip if commit == "HEAD"
62
+ sh("git log #{merge.strip}^..#{merge.strip} --pretty=%h").split("\n").include?(commit)
56
63
  end
57
64
 
58
65
  def find_merge_fuzzy(commit, branch)
@@ -72,7 +79,7 @@ module Git::Whence
72
79
 
73
80
  def find_merge_simple(commit, branch)
74
81
  result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%h' 2>/dev/null | tail -n 1"
75
- result unless result.strip.empty?
82
+ [commit, result] unless result.strip.empty?
76
83
  end
77
84
 
78
85
  def sh(command)
@@ -1,5 +1,5 @@
1
1
  module Git
2
2
  module Whence
3
- VERSION = "0.1.1"
3
+ VERSION = "0.1.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-whence
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
30
30
  F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
31
31
  /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
32
32
  -----END CERTIFICATE-----
33
- date: 2014-05-05 00:00:00.000000000 Z
33
+ date: 2014-05-17 00:00:00.000000000 Z
34
34
  dependencies: []
35
35
  description:
36
36
  email: michael@grosser.it
@@ -53,17 +53,17 @@ require_paths:
53
53
  - lib
54
54
  required_ruby_version: !ruby/object:Gem::Requirement
55
55
  requirements:
56
- - - ">="
56
+ - - '>='
57
57
  - !ruby/object:Gem::Version
58
58
  version: '0'
59
59
  required_rubygems_version: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ">="
61
+ - - '>='
62
62
  - !ruby/object:Gem::Version
63
63
  version: '0'
64
64
  requirements: []
65
65
  rubyforge_project:
66
- rubygems_version: 2.2.2
66
+ rubygems_version: 2.0.14
67
67
  signing_key:
68
68
  specification_version: 4
69
69
  summary: Find the merge and pull request a commit came from + find cherry-picks
metadata.gz.sig CHANGED
Binary file