From 858ac5f1327afe551994a217d73d6da1234215f4 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 09:13:15 -0400 Subject: [PATCH] Ignore subtree pull failures Rather than potentially leaving the developer in a state where `git stash pop` wasn't run, ignore failures in git subtree and let the developer fix issues and re-run the command. This makes `make-update` more idempotent. --- .gitlab/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/Makefile b/.gitlab/Makefile index d431a5e..465cd3a 100644 --- a/.gitlab/Makefile +++ b/.gitlab/Makefile @@ -12,5 +12,5 @@ include .gitlab/make/truenas.makefile .PHONY: make-update make-update: @git stash - @git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash + -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash @git stash pop