lib/anal_diffist.rb in analdiffist-0.3.0 vs lib/anal_diffist.rb in analdiffist-0.4.0
- old
+ new
@@ -1,8 +1,7 @@
module AnalDiffist
require 'analdiffist/target_finder'
- require 'analdiffist/reek_metrics'
require 'analdiffist/reek_parser'
require 'analdiffist/flog_parser'
require 'analdiffist/diff_set'
require 'analdiffist/standard_diffist'
require 'analdiffist/std_out_reporter'
@@ -47,10 +46,10 @@
current_branch_line = lines.detect{|x| x[0] == '*'}
current_branch = current_branch_line.split(' ')[1]
end
def get_refs_to_diff current_branch, start_ref, end_ref
- [ start_ref || "origin/master", end_ref || current_branch]
+ [ start_ref || `git merge-base HEAD origin/master`, end_ref || current_branch]
end
def analyze_ref ref_name
begin
checkout_revision ref_name