Part of OpenHistoricalMap/issues#786, adjusting workflow.

.github/workflows/ohm.upstream-sync.yml

@@ -25,6 +25,7 @@ jobs:
           git config --global user.name "github-actions"
           git config --global user.email "[email protected]"
           git remote add upstream "${UPSTREAM}"
+          git fetch upstream master
       - name: Make our script executable
         run: chmod +x ./scripts/upstream_sync.sh
       - name: Run sync script

scripts/upstream_sync.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-#
-#
-#
+# As we enter this script we are on the `main` branch and have `get fetch`ed
+# upstream/master.
 
-git checkout main
+git checkout master
 git branch -D the-sacrifice
 git checkout -b the-sacrifice
-git fetch upstream master
 
 mkdir upstream
 for i in $(git ls-tree upstream/master --name-only); do