Permalink
Browse files

Filtering more uninteresting output

  • Loading branch information...
1 parent 8333955 commit 79cf5b147c4e2df024ffa230f688983cb19cd24e Marc Liyanage committed Apr 29, 2010
Showing with 3 additions and 4 deletions.
  1. +3 −4 git-svn-clone-externals.rb
@@ -171,9 +171,8 @@ def update_current_dir
check_working_copy_url
# All sanity checks OK, perform the update
- shell('git svn rebase', true, [/is up to date/])
+ shell('git svn rebase', true, [/is up to date/, /First, rewinding/, /Fast-forwarded master/])
end
-
end
@@ -228,7 +227,8 @@ def read_externals
def read_externals_quick
find_git_svn_sandboxes_in_current_dir.map {|x| [x, nil]}
end
-
+
+
def find_git_svn_sandboxes_in_current_dir
%x(find . -type d -name .git).split("\n").select {|x| File.exist?("#{x}/svn")}.grep(%r%^./(.+)/.git$%) {$~[1]}
end
@@ -326,7 +326,6 @@ def shell(cmd, echo_stdout = false, echo_filter = [])
end
-
# ----------------------
ENV['PATH'] = "/opt/local/bin:#{ENV['PATH']}"

0 comments on commit 79cf5b1

Please sign in to comment.