From fb803351151f6f814902479f53d12480a52211c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Stein?= Date: Thu, 21 Mar 2019 14:56:31 +0100 Subject: [PATCH] Make -r parameter also available in combination with --rebase. --- lib/svn2git/migration.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb index 4de8a9e..9a3c015 100755 --- a/lib/svn2git/migration.rb +++ b/lib/svn2git/migration.rb @@ -330,7 +330,14 @@ def fix_branches svn_branches.delete_if { |b| b.strip !~ %r{^svn\/} } if @options[:rebase] - run_command("git svn fetch", true, true) + revision = @options[:revision] + cmd = "git svn fetch " + unless revision.nil? + range = revision.split(":") + range[1] = "HEAD" unless range[1] + cmd += "-r #{range[0]}:#{range[1]} " + end + run_command(cmd, true, true) end svn_branches.each do |branch|