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

Don't stash on make-update

Browse Source 
Make the developer handle their own stash. It's such a pain.
This commit is contained in:
ducoterra
2021-11-01 22:16:05 -04:00
parent 87731ffd6e
commit 2e7d3a2708
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

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