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

@@ -93,15 +93,17 @@
                     spawn("git checkout master", :raise => true)
 
                   #
                     spawn("git rebase --abort")
                     spawn("git am --abort")
-                    FileUtils.rm_rf("#{ dot_git }/rebase-apply")
 
+                    spawn("git am --abort")
+                    spawn("git rebase --abort")
+
                   #
                     status, stdout, stderr =
-                      spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
+                      spawn("git am --signoff --3way --ignore-space-change --ignore-whitespace", :capture => true, :stdin => patch.data)
 
                   #
                     patch.applied = !!(status == 0)
 
                   # commit the patch back to the repo
@@ -120,9 +122,12 @@
               # get pristine
               #
                 spawn("git checkout -f master", :raise => true)
                 spawn("git fetch --all", :raise => true)
                 spawn("git reset --hard origin/master", :raise => true)
+
+                spawn("git am --abort")
+                spawn("git rebase --abort")
 
               # get changes
               #
                 trying('to pull'){ spawn("git pull") }