hvsp: add abort action

[hvutilities.git] / scripts / kernel-send-patches.sh

diff --git a/scripts/kernel-send-patches.sh b/scripts/kernel-send-patches.sh
index 192cf91..4037d61 100755 (executable)
--- 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