Fixed issue nirvdrum#18: svn2git fails if branch contains shell speci…

…al characters
PowerKiKi · Dec 27, 2011 · b3f0f10 · b3f0f10
1 parent 7418919
commit b3f0f10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog.markdown b/ChangeLog.markdown
@@ -2,6 +2,7 @@
 
   * Fixed SVN branch detection (thanks thinkerbot)
   * Stop processing when a git subprocess fails (thanks thinkerbot)
+  * Fixed an issue with SVN branches containing shell special characters (thanks sleicht)
 
 # 2.1.0 - 2011-04-03
 

diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
@@ -236,14 +236,14 @@ def fix_branches
         if @options[:rebase] && (@local.include?(branch) || branch == 'trunk')
            lbranch = branch
            lbranch = 'master' if branch == 'trunk'
-           run_command("git checkout -f #{lbranch}")
-           run_command("git rebase remotes/svn/#{branch}")
+           run_command("git checkout -f \"#{lbranch}\"")
+           run_command("git rebase \"remotes/svn/#{branch}\"")
            next
         end
 
         next if branch == 'trunk' || @local.include?(branch)
-        run_command("git branch --track #{branch} remotes/svn/#{branch}")
-        run_command("git checkout #{branch}")
+        run_command("git branch --track \"#{branch}\" \"remotes/svn/#{branch}\"")
+        run_command("git checkout \"#{branch}"\")
       end
     end