Fix more conflict resolution errors

3 files changed, 2 insertions, 60 deletions

diff --git a/exe/bundle_ruby b/exe/bundle_ruby
deleted file mode 100755
index 734e5a7874..0000000000
--- a/exe/bundle_ruby
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-Signal.trap("INT") { exit 1 }
-
-require "bundler/ruby_version"
-require "bundler/ruby_dsl"
-require "bundler/shared_helpers"
-
-module Bundler
-  class GemfileError < RuntimeError; end
-  class Dsl
-    include RubyDsl
-
-    attr_accessor :ruby_version
-
-    def initialize
-      @ruby_version = nil
-    end
-
-    def eval_gemfile(gemfile, contents = nil)
-      contents ||= File.open(gemfile, "rb") { |f| f.read }
-      instance_eval(contents, gemfile.to_s, 1)
-    rescue SyntaxError => e
-      bt = e.message.split("\n")[1..-1]
-      raise GemfileError, ["Gemfile syntax error:", *bt].join("\n")
-    rescue ScriptError, RegexpError, NameError, ArgumentError => e
-      e.backtrace[0] = "#{e.backtrace[0]}: #{e.message} (#{e.class})"
-      STDERR.puts e.backtrace.join("\n       ")
-      raise GemfileError, "There was an error in your Gemfile," \
-        " and Bundler cannot continue."
-    end
-
-    def source(source, options = {})
-    end
-
-    def gem(name, *args)
-    end
-
-    def group(*args, &blk)
-    end
-  end
-end
-
-STDERR.puts "Warning: bundle_ruby will be deprecated in Bundler 2.0.0."
-
-dsl = Bundler::Dsl.new
-begin
-  dsl.eval_gemfile(Bundler::SharedHelpers.default_gemfile)
-  ruby_version = dsl.ruby_version
-  if ruby_version
-    puts ruby_version
-  else
-    puts "No ruby version specified"
-  end
-rescue Bundler::GemfileError => e
-  puts e.message
-  exit(-1)
-end
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 8b356f8932..9280598988 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -224,9 +224,9 @@ module Bundler
 
       # TODO 2.0 remove this deprecated git source
       git_source(:bitbucket) do |repo_name|
-        warn_deprecated_git_source(:bitbucket, "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git")
         user_name, repo_name = repo_name.split "/"
         repo_name ||= user_name
+        warn_deprecated_git_source(:bitbucket, "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git")
         "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
       end
     end
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index 00636f5d2e..e3b39c12b5 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -9,7 +9,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--jobs=NUMBER]
                  [--local]
                  [--deployment]
-		 [--force]
+                 [--force]
                  [--cache]
                  [--no-prune]
                  [--path PATH]