sync fixes

numtide · Dec 7, 2023 · 127b9b1 · 127b9b1
1 parent 9c8ab40
commit 127b9b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -19,6 +19,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        # Our ./sync.sh script needs the whole history
+        fetch-depth: 0
     - uses: cachix/install-nix-action@v15
     - name: configure git
       run: |

diff --git a/sync.sh b/sync.sh
@@ -15,7 +15,9 @@ trap cleanup EXIT
 
 # Get the latest commit from that branch
 git fetch origin "refs/heads/main"
-git fetch origin "refs/heads/$branch" || true
+if ! git fetch origin "refs/heads/$branch"; then
+  git branch "$branch"
+fi
 
 # Checkout that branch in a temporary worktree
 git worktree add -f "$workdir" "$branch"