lib/ro/git.rb in ro-1.3.4 vs lib/ro/git.rb in ro-1.3.5

@@ -90,12 +90,19 @@
                   unless stdout.to_s.strip.empty?
                   # apply the patch
                   #
                     spawn("git checkout master", :raise => true)
 
+                  #
+                    spawn("git rebase --abort")
+                    spawn("git am --abort")
+                    FileUtils.rm_rf("#{ dot_git }/rebase-apply")
+
+                  #
                     status, stdout, stderr =
                       spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
 
+                  #
                     patch.applied = !!(status == 0)
 
                   # commit the patch back to the repo
                   #
                     patch.committed =