0
@@ -1,5 +1,8 @@
0
 desc "This is just here for the other tasks and isn't intended for your use"
0
 task 'git:helpers' do
0
+  class GitError < RuntimeError; end
0
+  class GitRebaseError < GitError; end
0
+  
0
   def git_branch
0
     `git-branch`.grep(/^\*/).first.strip[(2..-1)]
0
   end
0
@@ -30,14 +33,37 @@ task 'git:helpers' do
0
         end
0
     end
0
   end
0
+  
0
+  def git_checkout(what = nil)
0
+    branch = git_branch
0
+    sh("git-checkout #{what}") if branch != what
0
+    if block_given?
0
+      yield
0
+      sh("git-checkout #{branch}") if branch != what
0
+    end
0
+  end
0
+  
0
   def git_fetch
0
     sh("git#{"-svn" if git_svn?} fetch")
0
   end
0
+  
0
+  def assert_command_succeeded(*args)
0
+    raise *args if $?.exitstatus != 0
0
+  end
0
+  
0
+  def assert_rebase_succeeded(what = nil)
0
+    assert_command_succeeded GitRebaseError, "conflict while rebasing branch #{what}"
0
+  end
0
+  
0
   def git_rebase(what = nil)
0
     if git_svn? then
0
-      sh("git-svn rebase --local #{what}")
0
+      git_checkout what do
0
+        sh("git-svn rebase --local")
0
+        assert_rebase_succeeded what
0
+      end
0
     else
0
       sh("git-rebase origin/master #{what}")
0
+      assert_rebase_succeeded what
0
     end
0
   end
0
   def git_push
0
@@ -143,18 +169,18 @@ task 'git:open' => [ 'git:helpers' ] do
0
       puts(%{* Already on branch "#{newbranch}"})
0
     else
0
       puts(%{* Switching to existing branch "#{newbranch}"})
0
-      `git-checkout #{newbranch}`
0
+      git_checkout newbranch
0
     end
0
     exit(0)
0
   end
0
   unless (branch == "master") then
0
     puts("* Switching to master")
0
-    `git-checkout master`
0
+    git_checkout 'master'
0
   end
0
   `git-checkout -b #{newbranch}`
0
   unless $?.exitstatus.zero? then
0
     puts("* Couldn't create branch #{newbranch}, switching back to #{branch}")
0
-    `git-checkout #{branch}`
0
+    git_checkout branch
0
     exit(1)
0
   end
0
   exit(0)
0
@@ -192,8 +218,9 @@ task 'git:update:all' => [ 'git:helpers' ] do
0
     switch = true
0
     git_branches.each do |b|
0
       puts("* Updating branch #{b}")
0
-      git_rebase(b)
0
-      unless $?.exitstatus.zero? then
0
+      begin
0
+        git_rebase(b)
0
+      rescue GitRebaseError => e
0
         puts("* Couldn't rebase #{b}, aborting so you can clean it up")
0
         switch = false
0
         break