services/minecraft_vanilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore git stash pop failures

Browse Source 
In the event the stash is empty, don't run stash pop.
This commit is contained in:
ducoterra
2021-11-01 09:21:43 -04:00
parent 2f767593ef
commit 6239af7f74
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -13,7 +13,7 @@ include .gitlab/make/truenas.makefile
make-update: make-update:
@git stash @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 @if [-z "$(shell git stash list)"; then git stash pop; fi;
.PHONY: make-push .PHONY: make-push
make-push: make-push: