Ensure git status is tracked at the correct time

The previous version would verify git status at time of `make verify` execution, but before all its dependencies executed. If one of the dependencies resulted in a dirty git, the check would still pass. Signed-off-by: Paulo Gomes <[email protected]>
fluxcd · Feb 9, 2022 · 3ff25a4 · 3ff25a4
1 parent 3fc70ff
commit 3ff25a4
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -208,13 +208,12 @@ ifneq ($(shell grep -o 'LIBGIT2_IMG ?= \w.*' Makefile | cut -d ' ' -f 3):$(shell
 	exit 1; \
 	}
 endif
-ifneq (, $(shell git status --porcelain --untracked-files=no))
-	@{ \
-	echo "working directory is dirty:"; \
-	git --no-pager diff; \
-	exit 1; \
-	}
-endif
+
+	@if [ ! "$$(git status --porcelain --untracked-files=no)" = "" ]; then \
+		echo "working directory is dirty:"; \
+		git --no-pager diff; \
+		exit 1; \
+	fi
 
 # go-install-tool will 'go install' any package $2 and install it to $1.
 define go-install-tool