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 +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/lib/git/whence.rb +9 -2
- data/lib/git/whence/version.rb +1 -1
- metadata +5 -5
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e10de9d0d61af77edf2f36e586fe91ec33693648
|
|
4
|
+
data.tar.gz: 381164b5f26998b6f6e3c665666f4f653425fe5a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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)
|
data/lib/git/whence/version.rb
CHANGED
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.
|
|
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-
|
|
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.
|
|
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
|