Make user stash their own damn changes

Stashing is so annoying to deal with in a scripted way. Just force the
user to stash their own changes. Only subtree pull if it's possible.
This commit is contained in:
ducoterra
2021-11-02 11:47:29 -04:00
parent d86b5052a8
commit 3c91292fea

View File

@@ -24,9 +24,7 @@ make-stash-drop:
.PHONY: make-update
make-update:
@git stash save $(STASH)
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
@git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
.PHONY: make-push
make-push: warning