Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Don't mutate original error trees when determining version_conflict_message #6650

Merged
merged 1 commit into from
Aug 15, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bundler/resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def version_conflict_message(e)
:possibility_type => possibility_type,
:reduce_trees => lambda do |trees|
# called first, because we want to reduce the amount of work required to find maximal empty sets
trees.uniq! {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
trees = trees.uniq {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }

# bail out if tree size is too big for Array#combination to make any sense
return trees if trees.size > 15
Expand Down