Merge remote-tracking branch 'oomathias/master'

Author: Stephan Leicht Vogt

lib/svn2git/migration.rb

@@ -28,8 +28,8 @@ def run!
       else
         clone!
       end
-      fix_tags
       fix_branches
+      fix_tags
       optimize_repos
     end
 
@@ -41,8 +41,8 @@ def parse(args)
       options[:nominimizeurl] = false
       options[:rootistrunk] = false
       options[:trunk] = 'trunk'
-      options[:branches] = 'branches'
-      options[:tags] = 'tags'
+      options[:branches] = []
+      options[:tags] = []
       options[:exclude] = []
       options[:revision] = nil
       options[:username] = nil
@@ -88,11 +88,11 @@ def parse(args)
         end
 
         opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches)') do |branches|
-          options[:branches] = branches
+          options[:branches] << branches
         end
 
         opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags)') do |tags|
-          options[:tags] = tags
+          options[:tags] << tags
         end
 
         opts.on('--rootistrunk', 'Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches') do
@@ -153,6 +153,15 @@ def parse(args)
       end
 
       @opts.parse! args
+
+      # Set default branches and tags if not explicitely configured
+      if ! options[:branches].nil? && options[:branches].length == 0 
+        options[:branches] << 'branches'
+      end
+      if ! options[:tags].nil? && options[:tags].length == 0 
+        options[:tags] << 'tags'
+      end
+
       options
     end
 
@@ -203,8 +212,12 @@ def clone!
           cmd += "--no-minimize-url "
         end
         cmd += "--trunk=#{trunk} " unless trunk.nil?
-        cmd += "--tags=#{tags} " unless tags.nil?
-        cmd += "--branches=#{branches} " unless branches.nil?
+        tags.each do |tags|
+          cmd += "--tags=#{tags} "
+        end unless tags.nil?
+        branches.each do |branches|
+          cmd += "--branches=#{branches} "
+        end unless branches.nil?
 
         cmd += @url
 
@@ -336,7 +349,7 @@ def fix_branches
 
       svn_branches.each do |branch|
         branch = branch.gsub(/^svn\//,'').strip
-        if @options[:rebase] && (@local.include?(branch) || branch == 'trunk')
+        if @options[:rebase] && (@local.include?(branch) || branch == 'trunk') && !(branch == 'trunk' && @options[:trunk].nil?)
            lbranch = branch
            lbranch = 'master' if branch == 'trunk'
            if @options[:bare] && _repos != '' && __cmd != ''