solano 1.31.2 → 1.31.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/solano/scm/git.rb +13 -6
- data/lib/solano/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
YjhjZDFmNjdhY2UzOTAwZDU2ODliMjYwODUzMDhlYWFlZDcwODc2YQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YzZhOTBlYmEyNWIyNzQwMDBhZjJiZGMyZmEzZjkwNDgzZjg1ZmFiOA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NTVmNDc5MDVlNDY1NTk0MDk2ZjZiZWI3MGNmYTc3NzNiYzkwMDkyNDViYjBl
|
10
|
+
NTFlYzg4ZTNhZGRiMmIwYWEyMDVjZjFhYjUzMmRmZGIyYzMyYmQ1OTQxNWYy
|
11
|
+
MThlZTUyMjMxNGVhMGEzYTViNWViMzhlMDA1OTFmZWYzODVkMDc=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZGI2YzJjZDJiOGI4MzAzMGZjMjIzZDA1ZDdjNGY4YTZlYzI2ZmViMWZjYjdm
|
14
|
+
NDVhYzY5ZmNkMzJiN2IzZDhkNjkxZDYxM2E0YzE1NzI2MThiMWQ3MWU3Nzdj
|
15
|
+
Zjk3NmEzZTIwYTBlM2YzNWI0NzdmMjIxZDk0YTJjZjJkNjg3Mjk=
|
data/lib/solano/scm/git.rb
CHANGED
@@ -203,16 +203,23 @@ module Solano
|
|
203
203
|
say Text::Warning::SAME_SNAPSHOT_COMMIT
|
204
204
|
return
|
205
205
|
end
|
206
|
+
upstream = self.origin_url
|
207
|
+
reg = Regexp.new('([^\s]*)\s*' + upstream.to_s + '\s*\(fetch\)')
|
208
|
+
if !upstream.nil? && (reg_match = reg.match(`git remote -v`)) then
|
209
|
+
origin_name = reg_match[1]
|
210
|
+
end
|
211
|
+
origin_name ||= "origin"
|
212
|
+
|
213
|
+
reg = Regexp.new("^\s*"+ origin_name.to_s + "/#{self.current_branch}")
|
214
|
+
if reg.match(`git branch -r --contains HEAD`) then
|
215
|
+
return
|
216
|
+
end
|
217
|
+
|
206
218
|
#check if snapshot commit is known locally
|
207
219
|
`git branch -q --contains #{patch_base_sha}`
|
208
220
|
if !$?.success? then
|
209
221
|
#try and create a patch from upstream instread of repo snapshot
|
210
|
-
|
211
|
-
reg = Regexp.new('([^\s]*)\s*' + upstream.to_s + '\s*\(fetch\)')
|
212
|
-
if !upstream.nil? && (reg_match = reg.match(`git remote -v`)) then
|
213
|
-
origin_name = reg_match[1]
|
214
|
-
end
|
215
|
-
origin_name ||= "origin"
|
222
|
+
|
216
223
|
say Text::Process::ATTEMPT_UPSTREAM_PATCH % upstream
|
217
224
|
#should be the remote name
|
218
225
|
patch_base_sha = `git rev-parse #{origin_name}`.to_s.strip
|
data/lib/solano/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solano
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.31.
|
4
|
+
version: 1.31.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solano Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2017-01-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|