dependabot-common 0.107.40 → 0.107.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5727f4b83578a8a0a1d6da3334103cdff42d6b694984e31496eafdd2c91455
-  data.tar.gz: 2c42ce1e5135c4281a0d8aaced1b1643a186064aa06f16cc2a017f1cf5e3578c
+  metadata.gz: 9c172692c0a26319c3b803130f9d1f0f3c170a3eaf4908e0f5c67008c368dbe5
+  data.tar.gz: b44a858707c64dbcc05a24058601577a89026afb1abca8b6326068b0f2f92567
 SHA512:
-  metadata.gz: 9f0dfa22f1f6297a19870322bdfb6fb1760e2ff439bb16b21ce3cd1fecb9dfd50fdb7f60306b9631dd278f631db9fa8685f8f46dbd7edf73eed83bc61547e794
-  data.tar.gz: '0729eef60bdbd45737a77e2f79e743bf5857cc5db995cc16f3e1d3c9aa614d53f90851e6a53cfda2d35b5ba1866dac18cff7f7783541f116acfd0cb69ce3057d'
+  metadata.gz: dc7dcaa20d247d1406d225767c7f9b7048f29068f0ead1b11de61aea24b299f5727323a8999b9790906265c721c27182872ff2c7de00b2eed9c9ef748c0c7ab4
+  data.tar.gz: c99335ea809f1bc4dabcf17a5ccba4cef41541880a6c81871a30cad7bc1fcae27cce30ad27aa442f48d3038fc8988fd7d100dcf2ad5e2072b5c226250325f461

data/lib/dependabot/pull_request_updater/github.rb

@@ -25,7 +25,8 @@ module Dependabot
       end
 
       def update
-        return unless branch_exists?
+        return unless pull_request_exists?
+        return unless branch_exists?(pull_request.head.ref)
 
         commit = create_commit
         branch = update_branch(commit)
@@ -45,10 +46,19 @@ module Dependabot
           base: target_branch
         )
       rescue Octokit::UnprocessableEntity => e
+        handle_pr_update_error(e)
+      end
+
+      def handle_pr_update_error(error)
         # Return quietly if the PR has been closed
-        return nil if e.message.match?(/closed pull request/i)
+        return if error.message.match?(/closed pull request/i)
 
-        raise
+        # Ignore cases where the target branch has been deleted
+        return if error.message.include?("field: base") &&
+                  source.branch &&
+                  !branch_exists?(source.branch)
+
+        raise error
       end
 
       def github_client_for_source
@@ -59,6 +69,13 @@ module Dependabot
           )
       end
 
+      def pull_request_exists?
+        pull_request
+        true
+      rescue Octokit::NotFound
+        false
+      end
+
       def pull_request
         @pull_request ||=
           github_client_for_source.pull_request(
@@ -67,8 +84,8 @@ module Dependabot
           )
       end
 
-      def branch_exists?
-        github_client_for_source.branch(source.repo, pull_request.head.ref)
+      def branch_exists?(name)
+        github_client_for_source.branch(source.repo, name)
       rescue Octokit::NotFound
         false
       end

data/lib/dependabot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.107.40
+  version: 0.107.41
 platform: ruby
 authors:
 - Dependabot