Back to rebase

Author: tautschnig

.github/workflows/update-subtree.yml

@@ -70,15 +70,15 @@ jobs:
         cd ../verify-rust-std
         git remote add rust-filtered ../rust-tmp/
         git fetch rust-filtered
-        git checkout -t -b update-subtree/library origin/subtree/library
+        git checkout -b update-subtree/library rust-filtered/subtree/library
         SUBTREE_HEAD_MSG=$(git log --format=%s -n 1 origin/subtree/library)
         UPSTREAM_FROM=$(git log --grep="${SUBTREE_HEAD_MSG}" -n 1 --format=%H rust-filtered/subtree/library)
         UPSTREAM_HEAD=$(git log --format=%H -n 1 rust-filtered/subtree/library)
         if [ "${UPSTREAM_HEAD}" = "${UPSTREAM_FROM}" ]; then
-          echo "Nothing to cherry-pick, ${UPSTREAM_FROM} matches ${UPSTREAM_HEAD} (${SUBTREE_HEAD_MSG})"
+          echo "Nothing to do, ${UPSTREAM_FROM} matches ${UPSTREAM_HEAD} (${SUBTREE_HEAD_MSG})"
           echo "MERGE_CONFLICTS=noop" >> $GITHUB_ENV
         else
-          git -c user.name=gitbot -c user.email=git@bot cherry-pick ${UPSTREAM_FROM}..rust-filtered/subtree/library
+          git -c user.name=gitbot -c user.email=git@bot rebase origin/subtree/library
           echo "MERGE_CONFLICTS=maybe" >> $GITHUB_ENV
         fi