saddler-reporter-support-git 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ba3ee6e561109454cbb6c3950b6d47765185c3
-  data.tar.gz: 7ec693a4ed2a65272a062ffa89fc9b6c35374a06
+  metadata.gz: fe0678fb49fba7a7f54b803440fa91dbf7a844b4
+  data.tar.gz: c94d6b141aff88badcd2e6e5b3578a8938f629d2
 SHA512:
-  metadata.gz: 118874bdf3f7559dc161b7e3bdd61355d24f38e7fd078be7db146b2e8f1047cf420dd1e2cc3804dab6006edf1bde329b66c257192aaa49a16f3139f0ed8368ae
-  data.tar.gz: 0f9fbc34acce66de0be4396a34071a366418748317e3d8f9a96573992d7c41d307dafd7de2eb278fd046f6a436052872168dec78367f45714b1da28e9b7239a5
+  metadata.gz: 68613d9fc2edf703d3d13ab945a03be67c5eec7a35b7a3c64e30dc847e6053e3943081f7dd88c8279785eea209037b08dab909a57681699b26895c390a163c14
+  data.tar.gz: 8134383e7593be1c6c6ce07a7bb161a00be8eb7440c7a8148fe132c6fdea0dc0138947eadce13f2d599e109891724e27e08de59acc01a161697b1d93bd51c16f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+<a name="2.0.1"></a>
+## [2.0.1](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v2.0.0...v2.0.1) (2016-06-05)
+
+* **repository:** Fix jenkins error: "commit_id is not part of the pull request"([3724bab](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/3724bab)), fixes [#44](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/44)
+
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v1.0.0...v2.0.0) (2016-05-14)
 

data/lib/saddler/reporter/support/git/repository.rb

@@ -63,8 +63,15 @@ module Saddler
           # @return [::Git::Object] merging object
           def merging_object
             return head unless merge_commit?(head)
-            commit = head.parents.select do |parent|
-              ![dig_sha(tracking), dig_sha(origin_tracking)].compact.include?(parent.sha)
+            if ENV['ghprbActualCommit'] && !ENV['ghprbActualCommit'].empty?
+              # GitHub pull request builder plugin (for Jenkins)
+              commit = head.parents.select do |parent|
+                parent.sha == ENV['ghprbActualCommit']
+              end
+            else
+              commit = head.parents.select do |parent|
+                ![dig_sha(tracking), dig_sha(origin_tracking)].compact.include?(parent.sha)
+              end
             end
             return commit.last if commit.count == 1
             head # fallback

data/lib/saddler/reporter/support/git/version.rb

@@ -3,7 +3,7 @@ module Saddler
     module Support
       module Git
         # version
-        VERSION = '2.0.0'.freeze
+        VERSION = '2.0.1'.freeze
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddler-reporter-support-git
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git