From 91de44bb0f60c46fc2cd676fe4cac501f3019bd2 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Thu, 19 Jan 2023 11:38:10 -0500 Subject: [PATCH] hvsp: add abort action --- scripts/kernel-send-patches.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 -- 2.20.1