Skip to content

Commit

Permalink
create upstream_migration
Browse files Browse the repository at this point in the history
  • Loading branch information
wumingzhilian committed Dec 28, 2023
1 parent c9630cc commit 9d84eb5
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions cherry.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/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

0 comments on commit 9d84eb5

Please sign in to comment.