From 71ff227953af7bc3a6ba9ff79aaaceaaacdec533 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 12 Dec 2021 19:00:46 -0500 Subject: [PATCH] Allow pulling specific branch with BRANCH_NAME Allow make-update and make-add to specify a branch name to pull an update from. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c196881..d052787 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ IMAGE ?= $(shell cat IMAGE):$(VERSION) IMAGE_LATEST ?= $(shell cat IMAGE):latest PWD ?= $(shell pwd) STASH ?= "common-update-stash" +MAKE_BRANCH ?= main include .gitlab/make/docker.makefile include .gitlab/make/helm.makefile @@ -14,6 +15,9 @@ include .gitlab/make/truenas.makefile include .gitlab/make/git.makefile include .gitlab/make/kubectl.makefile +# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main +# git reset head~1 .PHONY: make-update make-update: - @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main + @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH) + @git reset head~1