summaryrefslogtreecommitdiff
path: root/app/models/compare.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/compare.rb')
-rw-r--r--app/models/compare.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/compare.rb b/app/models/compare.rb
index 4856510f526..4b568a1d11c 100644
--- a/app/models/compare.rb
+++ b/app/models/compare.rb
@@ -11,9 +11,10 @@ class Compare
end
end
- def initialize(compare, project)
+ def initialize(compare, project, straight = false)
@compare = compare
@project = project
+ @straight = straight
end
def commits
@@ -36,6 +37,8 @@ class Compare
alias_method :commit, :head_commit
def base_commit
+ return start_commit if @straight
+
return @base_commit if defined?(@base_commit)
@base_commit = if start_commit && head_commit