lib/git/config.rb in git-2.0.0.pre1 vs lib/git/config.rb in git-2.0.0.pre2

- old
+ new

@@ -1,22 +1,26 @@ module Git class Config - attr_writer :binary_path, :git_ssh + attr_writer :binary_path, :git_ssh, :timeout def initialize @binary_path = nil @git_ssh = nil + @timeout = nil end def binary_path @binary_path || ENV['GIT_PATH'] && File.join(ENV['GIT_PATH'], 'git') || 'git' end def git_ssh @git_ssh || ENV['GIT_SSH'] end + def timeout + @timeout || (ENV['GIT_TIMEOUT'] && ENV['GIT_TIMEOUT'].to_i) + end end end