From c3e6d733c669cfa97f383ee00fd1479f1f65371f Mon Sep 17 00:00:00 2001 From: ducoterra Date: Tue, 2 Nov 2021 11:48:15 -0400 Subject: [PATCH] Switch to "subtree split" push strategy Split the subtree into a new branch before pushing to common. This creates a new branch automatically and ensures no weird histories get committed to common. --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6e1f49f..20a9590 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,5 @@ make-update: .PHONY: make-push make-push: warning @make make-update - @git remote add common git@gitlab.ducoterra.net:services/common.git - @git subtree push --prefix .gitlab common main - @git remote remove common - @make make-update + @git subtree split --branch common/$(PROJECT_NAME) --prefix .gitlab + @git push common common/$(PROJECT_NAME):common/$(PROJECT_NAME)