WIP testing to see if this fixes the repeating assignment

Change-Id: I0ad769e8b8590bf33e01f2be877e6fe20b4f4b61

Author: SortaCookie

.github/workflows/linearize_main.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
-          fetch-depth: 0
+          fetch-depth: 10
       - name: Checkout rebase_tools
         uses: actions/checkout@v4
         with:
@@ -35,13 +35,12 @@ jobs:
         run: |
           git config --global user.name "GitHub Release Automation"
           git config --global user.email "[email protected]"
-          echo "REV=$(git rev-parse --verify origin/main)" >> $GITHUB_ENV
       - name: Run linearize
         run: |
           set -eux
           # m114 merge commit=38a06fe8674ad2140ff85c87b5b3a817304e369a
           python main.py linearize --repo-path=${GITHUB_WORKSPACE} --source-branch=main --new-branch-name=automated/linear_main \
-            --start-commit-ref=38a06fe8674ad2140ff85c87b5b3a817304e369a --end-commit-ref=${REV}
+            --start-commit-ref=c949c7de9dca5222a7d82c437a041d8893db7cb5 --end-commit-ref="$(git rev-parse --verify origin/main)"
       - name: Update automated/linear_main and commit map, extract m114 commits
         run: |
           set -eux
@@ -54,8 +53,13 @@ jobs:
 
           # Create new commits json for m114
           python main.py commits --repo-path=${GITHUB_WORKSPACE} --source-branch=origin/automated/linear_main \
-            --start-commit-ref=38a06fe8674ad2140ff85c87b5b3a817304e369a --end-commit-ref=$REV --output-file=${GITHUB_WORKSPACE}/automated_commits_m114.json
-          git checkout experimental/rebase_tools
+            --start-commit-ref=c949c7de9dca5222a7d82c437a041d8893db7cb5 --end-commit-ref="$(git rev-parse --verify origin/automated/linear_main)" \
+            --output-file=${GITHUB_WORKSPACE}/automated_commits_m114.json
           git add automated_commits_m114.json
+          git status
           git commit -m "Linearization refresh on $(date +'%Y-%m-%d')."
+          export CP_COMMIT="$(git rev-parse --verify HEAD)"
+          git checkout experimental/rebase_tools
+          git cherry-pick --strategy=recursive -X theirs $CP_COMMIT
+          git status
           git push --force origin experimental/rebase_tools:experimental/rebase_tools