X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fkernel-send-patches.sh;fp=scripts%2Fkernel-send-patches.sh;h=4037d618d912f34de174b00ade5932aa01d463a5;hb=91de44bb0f60c46fc2cd676fe4cac501f3019bd2;hp=192cf912fc73709082f879154102fd80d3103486;hpb=735ac89e9fbcb88b0f84af221e521ed015f59995;p=hvutilities.git

diff --git a/scripts/kernel-send-patches.sh b/scripts/kernel-send-patches.sh
index 192cf91..4037d61 100755
--- a/scripts/kernel-send-patches.sh
+++ b/scripts/kernel-send-patches.sh
@@ -21,8 +21,15 @@ catch()
         echo "Error $1 occurred"
 
         if [ x"${orig_branch}" != x"" ]; then
+            if git status | grep -q "currently cherry-picking commit"; then
+                git cherry-pick --abort
+            fi
+
+            if git status | grep -q "currently editing a commit while rebasing branch"; then
+                git rebase --abort
+            fi
+
             git checkout ${orig_branch}
-            git rebase --abort
         fi
     fi