From 19d2e87b76dd0cfde66c944e1ec2c11f4994448c Mon Sep 17 00:00:00 2001 From: Dongliang Mu Date: Fri, 29 Dec 2023 10:53:20 +0800 Subject: [PATCH] remove cherry.sh script --- cherry.sh | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 cherry.sh diff --git a/cherry.sh b/cherry.sh deleted file mode 100644 index 6d77547e..00000000 --- a/cherry.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -start_commit=8a3bad020aacf83e2bdb5e291bd97696d8c4bf11 -end_commit=ca54396299553da128a4786545d9f1ad6fe7b22a - -commits=$(git rev-list $start_commit^..$end_commit) - -for commit in $commits; do - echo "Cherry-picking commit: $commit" - - # 尝试 cherrypick - git cherry-pick $commit - - # 检查 cherrypick 是否成功 - if [ $? -ne 0 ]; then - echo "Cherry-pick failed for commit: $commit" - # 记录失败的 commit 到文件 - echo $commit >> failed_commits.txt - # 跳过失败的 commit - git cherry-pick --abort - continue - fi -done -