From 3c91292feac91a14185bd2fca8b5981412d2903b Mon Sep 17 00:00:00 2001 From: ducoterra Date: Tue, 2 Nov 2021 11:47:29 -0400 Subject: [PATCH] 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. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d504165..6e1f49f 100644 --- a/Makefile +++ b/Makefile @@ -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