lib/rim/sync_helper.rb in esr-rim-1.3.5 vs lib/rim/sync_helper.rb in esr-rim-1.3.6
- old
+ new
@@ -29,9 +29,10 @@
if branch.empty?
raise RimException.new("Not on a git branch.")
elsif branch.start_with?("rim/")
raise RimException.new("The current git branch '#{branch}' is a rim integration branch. Please switch to a non rim branch to proceed.")
else
+ branch = "refs/heads/#{branch}"
branch_sha1 = s.rev_sha1(rim_branch)
remote_rev = get_latest_remote_revision(s, branch)
rev = get_latest_clean_path_revision(s, branch, remote_rev)
if !s.has_branch?(rim_branch) || has_ancestor?(s, branch, s.rev_sha1(rim_branch)) || !has_ancestor?(s, rim_branch, remote_rev)
s.execute("git branch -f #{rim_branch} #{rev}")