dependabot-common 0.95.54 → 0.95.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13741bfbc94d2b4fe61be336631f4f3626003a37475125815df78a303d83c853
-  data.tar.gz: 4a30039376a2c846e5c77bc9a23a4a47b321b625f77a271a8b3cb6c60c10823a
+  metadata.gz: 1719ff6cde17a1b89f4137d99087062afc7cac00142d7cead53d99233d3d3aed
+  data.tar.gz: 66dff3999fabbd62874b66c782882bc3d2b4822ed4d324fbc17d03d3de9d8733
 SHA512:
-  metadata.gz: bcba67b17b29c226d81c6c9e9b642aed69c5796b72582e3775a0db2dde78c452e6f69ef90b5e29ded39973740d7e2dea9de488650f69d1f327ccaeeea613dbb6
-  data.tar.gz: dfb0ce2395ce3b3f24be27fd909669d97513d479d578a54d6c832168b98d6f51537ead1587c4d6f7ca0b241b32a08049c89b47bc13843a01273cbd63cd7b1ed4
+  metadata.gz: 4a748ceff58499242fa7f1ba7d1d8a06817b3dcd55afa77a4ecbbf59dc9e8a252be36be2563bae2635e8f3e01e9cc7ce763fbf8ad78e01c8b65f663291b3a6e3
+  data.tar.gz: c9991d1b53df730114c65bd682cb01ff556b301cfce4ef7c93c4711637b9c7af43718ccab2c581db14dcc1a37b4ed4b31065e28fce007ad6f325f4f73719ab01

data/lib/dependabot/pull_request_creator/github.rb

@@ -114,13 +114,25 @@ module Dependabot
           options[:signature] = commit_signature(tree, options[:author])
         end
 
-        github_client_for_source.create_commit(
-          source.repo,
-          commit_message,
-          tree.sha,
-          base_commit,
-          options
-        )
+        begin
+          github_client_for_source.create_commit(
+            source.repo,
+            commit_message,
+            tree.sha,
+            base_commit,
+            options
+          )
+        rescue Octokit::UnprocessableEntity => error
+          raise unless error.message == "Tree SHA does not exist"
+
+          # Sometimes a race condition on GitHub's side means we get an error
+          # here. No harm in retrying if we do.
+          # NOTE: Error here might be that the tree got deleted somehow. If it's
+          # that we'll need to change this retry to recreate the tree, too.
+          retry_count ||= 0
+          retry_count += 1
+          retry_count > 3 ? raise : retry
+        end
       end
 
       def create_tree

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.95.54"
+  VERSION = "0.95.55"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.95.54
+  version: 0.95.55
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr