From 23756e7653bb1e6309fcaa9aad2140a942de4a6c Mon Sep 17 00:00:00 2001 From: Marc Liyanage Date: Tue, 27 Apr 2010 18:24:37 -0700 Subject: [PATCH] Fix old variable references --- git-svn-clone-externals.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-svn-clone-externals.rb b/git-svn-clone-externals.rb index c532638..62d45fb 100755 --- a/git-svn-clone-externals.rb +++ b/git-svn-clone-externals.rb @@ -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 @@ -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")