dependabot-common 0.99.2 → 0.99.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a508e879f8d29ad3f3cd98cf1ca94678db0df808c10e164cf15d36321bc0ec
-  data.tar.gz: ea6ac533a727a089319620295b1cc743dac84790f1ad68618984b49f94fabb72
+  metadata.gz: 4806c3daa2f6d726a4a4718411d198958e05a3df78aadcb989a10dcdbe4ccf05
+  data.tar.gz: 87a85c82d5830f41b3d4c7861f148db6190c4cb9606fb687a5048a4c88308c9d
 SHA512:
-  metadata.gz: 727be6c321f6695caaedd18de54f763f9054c7a19b802eacd9cb11b5964aafeb283b0cd7256cdb003f4c1fbb7e304560a7e7e2e061e73b8db7b97bb4590c8feb
-  data.tar.gz: '082c6fb68ead8199406eb90395d25e1df391b93a5b841e0139656b3422ee1ee7b3a2ad2b6259820a8ba17f635f209e8fa18e5dc70d740d6cb708d6cb903fe7ca'
+  metadata.gz: 286596b6d37125696ef60b9fc69c3c16b46a353b7b4dcb1d128a4ce4f1891fe360be6de53bc3a50179656615a35be2cd3f93b68fa1548f33f7a6062875f7ef91
+  data.tar.gz: 41a3b1c98c6591f17b88596d55072a6b376e3566c4095051b9d91e5b2a3b266cd632de2d54e36cf837c9d0668df84edaa6ed8aa047b8327e16e49e7af0e9a95f

data/lib/dependabot/pull_request_creator/github.rb

@@ -35,7 +35,7 @@ module Dependabot
       end
 
       def create
-        return if branch_exists? && pull_request_exists?
+        return if branch_exists?(branch_name) && pull_request_exists?
 
         commit = create_commit
         branch = create_or_update_branch(commit)
@@ -61,13 +61,13 @@ module Dependabot
           )
       end
 
-      def branch_exists?
+      def branch_exists?(name)
         @branch_ref ||=
-          github_client_for_source.ref(source.repo, "heads/#{branch_name}")
+          github_client_for_source.ref(source.repo, "heads/#{name}")
         if @branch_ref.is_a?(Array)
-          @branch_ref.any? { |r| r.ref == "refs/heads/#{branch_name}" }
+          @branch_ref.any? { |r| r.ref == "refs/heads/#{name}" }
         else
-          @branch_ref.ref == "refs/heads/#{branch_name}"
+          @branch_ref.ref == "refs/heads/#{name}"
         end
       rescue Octokit::NotFound
         false
@@ -162,7 +162,11 @@ module Dependabot
       end
 
       def create_or_update_branch(commit)
-        branch_exists? ? update_branch(commit) : create_branch(commit)
+        if branch_exists?(branch_name)
+          update_branch(commit)
+        else
+          create_branch(commit)
+        end
       rescue Octokit::UnprocessableEntity
         # A race condition may cause GitHub to fail here, in which case we retry
         retry_count ||= 0
@@ -253,7 +257,14 @@ module Dependabot
         )
       rescue Octokit::UnprocessableEntity => error
         # Ignore races that we lose
-        raise unless error.message.include?("pull request already exists")
+        return if error.message.include?("pull request already exists")
+
+        # Ignore cases where the target branch has been deleted
+        return if error.message.include?("field: base") &&
+                  source.branch &&
+                  !branch_exists?(source.branch)
+
+        raise
       end
 
       def default_branch

data/lib/dependabot/version.rb

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

metadata

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