Clean up the branch listings a bit more.

nirvdrum · nirvdrum · commit 0ab29fc273a2 · 2010-05-29T09:49:36.000-04:00
diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
@@ -150,8 +150,12 @@ def clone!
     end
 
     def get_branches
-      @local = run_command("git branch -l").split(/\n/).collect{ |b| b.strip }
-      @remote = run_command("git branch -r").split(/\n/).collect{ |b| b.strip }
+      # Get the list of local and remote branches, taking care to ignore console color codes and ignoring the
+      # '*' character used to indicate the currently selected branch.
+      @local = run_command("git branch -l --no-color").split(/\n/).collect{ |b| b.gsub(/\*/,'').strip }
+      @remote = run_command("git branch -r --no-color").split(/\n/).collect{ |b| b.gsub(/\*/,'').strip }
+
+      # Tags are remote branches that start with "tags/".
       @tags = @remote.find_all { |b| b.strip =~ %r{^tags\/} }
     end
 
