bin/svn2git

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
 # Copyright (c) 2008 James Coglan
 #

lib/svn2git/migration.rb

@@ -32,7 +32,7 @@ def run!
         ENV["LANGUAGE"]="en_US"
         log "LANGUAGE is: #{ENV["LANGUAGE"]}\n"
       end
-
+      
       if @options[:rebase]
         get_branches
       elsif @options[:rebasebranch]
@@ -379,7 +379,7 @@ def fix_branches
         if @cannot_setup_tracking_information
           run_command(Svn2Git::Migration.checkout_svn_branch(branch))
         else
-          status = run_command("git branch --track \"#{branch}\" \"remotes/svn/#{branch}\"", false)
+          status = run_command("git branch \"#{branch}\" \"remotes/svn/#{branch}\"", false)
 
           # As of git 1.8.3.2, tracking information cannot be set up for remote SVN branches:
           # http://git.661346.n2.nabble.com/git-svn-Use-prefix-by-default-td7594288.html#a7597159
@@ -467,9 +467,9 @@ def run_command(cmd, exit_on_error=true, printout_output=false)
               # nil is our cue to stop looping (pun intended).
               break if user_reply.nil?
 
-              stdin.puts user_reply
-              stdin.close
-              rescue IOError
+              $stdin.puts user_reply
+              $stdin.close
+            rescue IOError
               $stdout.print "No input requested.\n"
             end
           end