lib/danger/scm_source/git_repo.rb in danger-additional-logging-0.0.10 vs lib/danger/scm_source/git_repo.rb in danger-additional-logging-0.0.11

@@ -148,15 +148,13 @@
 
     def find_merge_base(repo, from, to)
       puts "find_merge_base(from=#{from}, to=#{to})"
       
       possible_merge_base = possible_merge_base(repo, from, to)
-      puts "possible_merge_base result: #{possible_merge_base}"
       return possible_merge_base if possible_merge_base
 
       possible_merge_base = find_merge_base_with_incremental_fetch(repo, from, to)
-      puts "find_merge_base_with_incremental_fetch result: #{possible_merge_base}"
       return possible_merge_base if possible_merge_base
 
       git_in_depth_fetch
       possible_merge_base = possible_merge_base(repo, from, to)
 
@@ -164,11 +162,11 @@
 
       possible_merge_base
     end
 
     def find_merge_base_with_incremental_fetch(repo, from, to)
-      puts "find_merge_base_with_incremental_fetch"
+      puts "find_merge_base_with_incremental_fetch(from=#{from}, to=#{to})"
 
       from_is_ref = commit_is_ref?(from)
       to_is_ref = commit_is_ref?(to)
 
       return unless from_is_ref || to_is_ref
@@ -182,10 +180,11 @@
         possible_merge_base(repo, from, to)
       end
     end
 
     def possible_merge_base(repo, from, to)
+      puts "possible_merge_base(from=#{from}, to=#{to})"
       [repo.merge_base(from, to)].find { |base| commit_exists?(base) }
     end
 
     def commits_in_branch_count(from, to)
       exec("rev-list #{from}..#{to} --count").to_i
@@ -220,9 +219,15 @@
 module Git
   class Base
     # Use git-merge-base https://git-scm.com/docs/git-merge-base to
     # find as good common ancestors as possible for a merge
     def merge_base(commit1, commit2, *other_commits)
-      Open3.popen2("git", "merge-base", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
+      puts "will git merge-base commit1 #{commit1}, commit2 #{commit2}"
+      output = Open3.popen2("git", "merge-base", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
+      
+      puts "Command output:"
+      puts output
+      
+      output
     end
   end
 end