Ignore git stash pop failures

In the event the stash is empty, don't run stash pop.
2021-11-01 09:21:43 -04:00
parent 2f767593ef
commit 6239af7f74
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -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: