Browse files

Minor bug fix to git-all for git-svn repos

  • Loading branch information...
1 parent 88ad23d commit 1b077270504366b2bc2d8c4e3602974c068e9cb4 @jwiegley committed Apr 26, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 git-all
View
6 git-all
@@ -42,12 +42,12 @@ module GitUpdate
end
def GitUpdate.git_svn_repo g
- g.config['svn-remote.svn.url']
+ g.config['svn-remote.svn.url'] rescue false
end
def GitUpdate.fetch g, working_dir
case
- when git_svn_repo(g)
+ when git_svn_repo g
lines = `git --git-dir='#{@git_dir}' svn fetch 2>&1`.split("\n")
lines.reject! do |line|
line =~ /^(W: |This may take a while|Checked through|$)/
@@ -81,7 +81,7 @@ module GitUpdate
end
def GitUpdate.push_or_pull g, working_dir, branch
- remote = g.config["branch.#{branch.name}.remote"] || git_svn_repo(g)
+ remote = g.config["branch.#{branch.name}.remote"] || git_svn_repo g
if remote
remote_sha =
if git_svn_repo g

4 comments on commit 1b07727

@dabrahams

Removal of parens around g makes this break for me:

/Users/dave/bin/git-scripts/git-all:50: syntax error, unexpected tIDENTIFIER, expecting keyword_do or '{' or '('
/Users/dave/bin/git-scripts/git-all:67: warning: else without rescue is useless
/Users/dave/bin/git-scripts/git-all:84: syntax error, unexpected tIDENTIFIER, expecting keyword_do or '{' or '('
/Users/dave/bin/git-scripts/git-all:125: syntax error, unexpected keyword_end, expecting $end

@jwiegley
Owner
@dabrahams

you mean "parens?" Yeah, partially fixes. I am having other problems.

@jwiegley
Owner
Please sign in to comment.