Part of OpenHistoricalMap/issues#786, adjusting workflow.

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

@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: Check out our repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Check out the upstream repository
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -26,6 +28,8 @@ jobs:
           git config --global user.email "[email protected]"
           git remote add upstream "${UPSTREAM}"
           git fetch upstream master
+          git branch -D the-sacrifice
+          git checkout -b the-sacrifice
       - 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.
+# As we enter this script we have created `the-sacrifice` from our `main` branch and
+# have `git fetch`ed upstream/master.
 
-git checkout main
-git branch -D the-sacrifice
-git checkout -b the-sacrifice
-
-mkdir upstream
+if [ ! -d "upstream" ]; then
+  mkdir upstream
+fi
 for i in $(git ls-tree upstream/master --name-only); do
   if [[ $i == *.md ]];then
     echo $i