Skip to content

Commit

Permalink
Fix old variable references
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Liyanage committed Apr 28, 2010
1 parent 6c506fc commit 23756e7
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions git-svn-clone-externals.rb
Expand Up @@ -170,9 +170,9 @@ def update_current_dir

def check_working_copy_branch
shell('git status', git_version >= 1.7)[0] =~ /On branch (\S+)/
raise "Error: Unable to determine Git branch in '#{wd}' using 'git status'" unless $~
raise "Error: Unable to determine Git branch in '#{Dir.getwd}' using 'git status'" unless $~
branch = $~[1]
raise "Error: Git branch is '#{branch}', should be 'master' in '#{wd}'\n" unless branch == 'master'
raise "Error: Git branch is '#{branch}', should be 'master' in '#{Dir.getwd}'\n" unless branch == 'master'
end


Expand Down Expand Up @@ -267,14 +267,17 @@ def known_url?(url)
url == svn_url_for_current_dir || (@parent && @parent.known_url?(url))
end


def quick?
return (@parent && @parent.quick?) || @quick
end


def no_history?
return (@parent && @parent.no_history?) || @no_history
end


def shell(cmd, abort_on_error = true)
t1 = Time.now
list = %x(#{cmd}).split("\n")
Expand Down

0 comments on commit 23756e7

Please sign in to comment.