solano 1.31.2 → 1.31.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWU0NWM2NTBmMDQ1YzdkMzE4YWU1ZTE1MjQ4ODBkMTRjMjg2NDY1Ng==
+    YjhjZDFmNjdhY2UzOTAwZDU2ODliMjYwODUzMDhlYWFlZDcwODc2YQ==
   data.tar.gz: !binary |-
-    Mzc0MmYwMjMwOWE5ZmU3N2VjNWYxNDFjMzYwZWNjZmVjZDI0OTViYw==
+    YzZhOTBlYmEyNWIyNzQwMDBhZjJiZGMyZmEzZjkwNDgzZjg1ZmFiOA==
 SHA512:
   metadata.gz: !binary |-
-    NDQ2MzFmMDZmNGQ4OGZlNGQ4OGRlMzA5YzEwYjkzYzE3ZTExZjc5ZDJmNTEw
-    NzAyOGM4NGEwY2U4YmI2ZTk4MWEzOWJiYmYxOTRjOTZhZWMzYjdiZDI0YWY3
-    ZmI0NjVmNDgyMzllZGMzYjAxZTE5YWQ1MTE0OGM3MmJjMTdkMGI=
+    NTVmNDc5MDVlNDY1NTk0MDk2ZjZiZWI3MGNmYTc3NzNiYzkwMDkyNDViYjBl
+    NTFlYzg4ZTNhZGRiMmIwYWEyMDVjZjFhYjUzMmRmZGIyYzMyYmQ1OTQxNWYy
+    MThlZTUyMjMxNGVhMGEzYTViNWViMzhlMDA1OTFmZWYzODVkMDc=
   data.tar.gz: !binary |-
-    NGM1NDA4ZTUyZjkxY2NiNjUzM2ZmZTFjN2FjY2Q3NjY1ZDkyMmFiNThhZTc2
-    MGJhZjE5ZDk2MzhiNDY3NzllOTk1YTMxYTFkYjJlZmQ3NzQ2MjYwM2ViZGJk
-    NWE1YTY4ZDFjZDg0NjViNGUwNjEwZTEzMTc4YzQ4ZWJkZWY5MGI=
+    ZGI2YzJjZDJiOGI4MzAzMGZjMjIzZDA1ZDdjNGY4YTZlYzI2ZmViMWZjYjdm
+    NDVhYzY5ZmNkMzJiN2IzZDhkNjkxZDYxM2E0YzE1NzI2MThiMWQ3MWU3Nzdj
+    Zjk3NmEzZTIwYTBlM2YzNWI0NzdmMjIxZDk0YTJjZjJkNjg3Mjk=

data/lib/solano/scm/git.rb

@@ -203,16 +203,23 @@ module Solano
         say Text::Warning::SAME_SNAPSHOT_COMMIT
         return
       end
+      upstream = self.origin_url
+      reg = Regexp.new('([^\s]*)\s*' + upstream.to_s + '\s*\(fetch\)')
+      if !upstream.nil? && (reg_match = reg.match(`git remote -v`)) then
+        origin_name = reg_match[1]
+      end
+      origin_name ||= "origin"
+
+      reg = Regexp.new("^\s*"+ origin_name.to_s + "/#{self.current_branch}")
+      if reg.match(`git branch -r --contains HEAD`) then
+        return
+      end
+
       #check if snapshot commit is known locally
       `git branch -q --contains #{patch_base_sha}`
       if !$?.success? then
         #try and create a patch from upstream instread of repo snapshot
-        upstream = self.origin_url
-        reg = Regexp.new('([^\s]*)\s*' + upstream.to_s + '\s*\(fetch\)')
-        if !upstream.nil? && (reg_match = reg.match(`git remote -v`)) then
-          origin_name = reg_match[1]
-        end
-        origin_name ||= "origin"
+
         say Text::Process::ATTEMPT_UPSTREAM_PATCH % upstream
         #should be the remote name
         patch_base_sha = `git rev-parse #{origin_name}`.to_s.strip

data/lib/solano/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011-2016 Solano Labs All Rights Reserved
 
 module Solano
-  VERSION = "1.31.2"
+  VERSION = "1.31.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solano
 version: !ruby/object:Gem::Version
-  version: 1.31.2
+  version: 1.31.3
 platform: ruby
 authors:
 - Solano Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor