From 6239af7f744aeca23db083fa122ef2679e16420e Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 09:21:43 -0400 Subject: [PATCH] Ignore git stash pop failures In the event the stash is empty, don't run stash pop. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb8e27c..99b0031 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ include .gitlab/make/truenas.makefile make-update: @git stash -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash - @git stash pop + @if [-z "$(shell git stash list)"; then git stash pop; fi; .PHONY: make-push make-push: