From 4e34cf95bd71d23ee65cbe43705e4b7954b05ea3 Mon Sep 17 00:00:00 2001
From: Armaan Bhojwani <me@armaanb.net>
Date: Mon, 18 Jan 2021 14:43:37 -0500
Subject: [PATCH 1/1] Web-update-server: fix git pull command, set -e

---
 web-update-server | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-update-server b/web-update-server
index 67d0ea4..58fa98e 100755
--- a/web-update-server
+++ b/web-update-server
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 # Executed over SSH on builds.sr.ht for my websites
 
+set -e
+
 gitrun() {
   git -C $dir reset --hard
   git -C $dir clean -fxd
-  git -C $dir pull --rebase
+  git -C $dir pull origin main --ff-only 
 }
 
 if [[ $1 == "gemini" ]]; then
-- 
2.39.2