Fix implementation bug

Author: AliSoftware

lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb

@@ -178,28 +178,29 @@ def self.fetch_all_tags
       #
       def self.find_merge_base(ref1, ref2)
         git_repo = Git.open(Dir.pwd)
-        git_repo.merge_base(ref1, ref2)
+        ref1_full, ref2_full = [ref1, ref2].map do |ref|
+          # If the ref is the name of a branch and that branch exists remotely but not locally,
+          # then prefix `origin/` to the ref name to fallback to use the remote reference
+          git_repo.is_remote_branch?(ref) && !git_repo.is_local_branch?(ref) ? "origin/#{ref}" : ref
+        end
+        git_repo.merge_base(ref1_full, ref2_full)&.first&.sha
       end
 
       # Checks if two git references point to the same commit.
       #
       # @param ref1 [String] the first git reference to check.
       # @param ref2 [String] the second git reference to check.
-      # @param remote_name [String] the name of the remote repository to use (default is 'origin').
-      #                             If nil or empty, no remote prefix will be used.
       #
       # @return [Boolean] true if the two references point to the same commit, false otherwise.
       #
-      def self.point_to_same_commit?(ref1, ref2, remote_name: 'origin')
+      def self.point_to_same_commit?(ref1, ref2)
         git_repo = Git.open(Dir.pwd)
 
-        ref1_full = remote_name.to_s.empty? ? ref1 : "#{remote_name}/#{ref1}"
-        ref2_full = remote_name.to_s.empty? ? ref2 : "#{remote_name}/#{ref2}"
         begin
-          ref1_commit = git_repo.gcommit(ref1_full)
-          ref2_commit = git_repo.gcommit(ref2_full)
+          ref1_commit = git_repo.gcommit(ref1)
+          ref2_commit = git_repo.gcommit(ref2)
         rescue StandardError => e
-          UI.error "Error fetching commits for #{ref1_full} and #{ref2_full}: #{e.message}"
+          UI.error "Error fetching commits for #{ref1} and/or #{ref2}: #{e.message}"
           return false
         end
         ref1_commit.sha == ref2_commit.sha

spec/git_helper_spec.rb

@@ -111,9 +111,6 @@
   end
 
   describe 'point_to_same_commit?(ref1, ref2)' do
-    # We cannot test the happy path using a remote because the repo we use for the tests does not have a remote.
-    let(:remote_name) { nil }
-
     before do
       # Spec branching setup:
       #
@@ -148,37 +145,37 @@
     end
 
     it 'checks if a tag and a branch point to the same commit' do
-      same_commit = described_class.point_to_same_commit?('1.0', 'another-branch', remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?('1.0', 'another-branch')
       expect(same_commit).to be false
     end
 
     it 'checks if a tag and a branch that had a merge point to the same commit' do
-      same_commit = described_class.point_to_same_commit?('1.0', 'main', remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?('1.0', 'main')
       expect(same_commit).to be false
     end
 
     it 'checks if a tag and a commit hash point to the same commit' do
-      same_commit = described_class.point_to_same_commit?('1.0', commit_hash(commit_message: 'commit D'), remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?('1.0', commit_hash(commit_message: 'commit D'))
       expect(same_commit).to be false
     end
 
     it 'checks if a commit hash and a branch point to the same commit' do
-      same_commit = described_class.point_to_same_commit?(commit_hash(commit_message: 'commit B'), 'another-branch', remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?(commit_hash(commit_message: 'commit B'), 'another-branch')
       expect(same_commit).to be false
     end
 
     it 'checks if commits between the same branch point to the same commit' do
-      same_commit = described_class.point_to_same_commit?('feature-branch', 'feature-branch', remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?('feature-branch', 'feature-branch')
       expect(same_commit).to be true
     end
 
     it 'checks if commits between branches that have no difference point to the same commit' do
-      same_commit = described_class.point_to_same_commit?('another-branch', 'new-branch', remote_name: remote_name)
+      same_commit = described_class.point_to_same_commit?('another-branch', 'new-branch')
       expect(same_commit).to be true
     end
 
     it 'raises error for a non-existent base_ref' do
-      expect { described_class.point_to_same_commit?('non-existent', 'main', remote_name: remote_name) }.to raise_error(StandardError)
+      expect { described_class.point_to_same_commit?('non-existent', 'main') }.to raise_error(StandardError)
     end
   end