From: Lady <redacted>
Date: Sat, 23 Dec 2023 20:30:49 +0000 (-0500)
Subject: Pull before updating x_status_git
X-Git-Url: https://git.ladys.computer/Status/commitdiff_plain/f581c570c91987481f4a3d99600bcbe862df92b9?hp=03bf331b85c25198e9f1d47517c2ceabbff4e553

Pull before updating x_status_git

Otherwise statuses which exist on the server but not locally will be
deleted on next force push.
---

diff --git a/Makefile b/Makefile
index 7e6dbb4..e37aad5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ nothing:
 	@echo 'Type `make remote` to update the remote post-receive script.'
 
 update:
+	git pull
 	git remote add upstream $(X_STATUS_GIT)
 	git fetch upstream
 	git checkout --detach upstream/current