Refactor full sha revision match logic

rubygems · Sep 26, 2023 · f0d8255 · f0d8255
1 parent a30712c
commit f0d8255
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/bundler/lib/bundler/source/git/git_proxy.rb b/bundler/lib/bundler/source/git/git_proxy.rb
@@ -130,7 +130,7 @@ def copy_to(destination, submodules = false)
             end
           end
 
-          ref = @commit_ref || (full_sha_revision? && @revision)
+          ref = @commit_ref || (locked_to_full_sha? && @revision)
           git "fetch", "--force", "--quiet", *extra_fetch_args(ref), :dir => destination if ref
 
           git "reset", "--hard", @revision, :dir => destination
@@ -248,11 +248,15 @@ def not_pinned?
         end
 
         def pinned_to_full_sha?
-          ref =~ /\A\h{40}\z/
+          full_sha_revision?(ref)
         end
 
-        def full_sha_revision?
-          @revision.match?(/\A\h{40}\z/)
+        def locked_to_full_sha?
+          full_sha_revision?(@revision)
+        end
+
+        def full_sha_revision?(ref)
+          ref&.match?(/\A\h{40}\z/)
         end
 
         def git_null(*command, dir: nil)