From 85e84d50b43a419bbc0c212dd0bb1e50769c7b52 Mon Sep 17 00:00:00 2001
From: Aaron Dalton <aadalton@vt.edu>
Date: Fri, 19 Jan 2024 07:59:17 -0800
Subject: [PATCH] More fixes

---
 .github/workflows/fork-sync.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
index 696ae41c..ca81d363 100644
--- a/.github/workflows/fork-sync.yml
+++ b/.github/workflows/fork-sync.yml
@@ -29,7 +29,7 @@ jobs:
             echo ${r#refs/tags/}
           '
           echo 'NEW_TAGS<<EOF' >> $GITHUB_OUTPUT
-          $(eval `git for-each-ref --format=$fmt --no-merge upstream refs/tags`) >> $GITHUB_OUTPUT
+          $(eval `git for-each-ref --format=$fmt --no-merge main refs/tags`) >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
       - name: Set Identity
         run: |
@@ -40,7 +40,7 @@ jobs:
         run: |
           for TAG in ${NEW_TAGS}; do
             git checkout -b release/${TAG} ${TAG}
-            git rev-list --no-merges --reverse main ^upstream | git cherry-pick --stdin
+            git rev-list --reverse main ^upstream/main | git cherry-pick --stdin
             git tag -d ${TAG}
             git tag ${TAG} release/${TAG}
           done