services/Common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore subtree pull failures

Browse Source 
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.
This commit is contained in:
ducoterra
2021-11-01 09:13:15 -04:00
parent da69418b0d
commit 66b4fdb902
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

@@ -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