From ae216487bdeec604b313fbdd7675a50be9efc716 Mon Sep 17 00:00:00 2001 From: mhucka Date: Sun, 24 Oct 2021 13:20:10 -0700 Subject: [PATCH] Must change how branch testing is done The other changes in the file, involving when the variables are evaluated, meant that the use of Make's ifneq conditional no longer worked as expected. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d4c6548..c894fd5 100644 --- a/Makefile +++ b/Makefile @@ -150,9 +150,7 @@ run-shiv: release: | test-branch release-on-github print-instructions test-branch: vars -ifneq ($(branch),main) - $(error Current git branch != main. Merge changes into main first) -endif + $(if $(filter-out $(branch),main),$(error Current git branch != main.)) update-init: vars @sed -i .bak -e "s|^\(__version__ *=\).*|\1 '$(version)'|" $(init_file)