Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix old variable references

  • Loading branch information...
commit 23756e7653bb1e6309fcaa9aad2140a942de4a6c 1 parent 6c506fc
Marc Liyanage authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 git-svn-clone-externals.rb
View
7 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")
Please sign in to comment.
Something went wrong with that request. Please try again.