From e3e12301802793830661833f0426ee700fab536b Mon Sep 17 00:00:00 2001 From: Bart Van Bos Date: Sun, 8 Nov 2026 09:05:32 +0100 Subject: [PATCH] fix(make): mark the commit -dirty for uncommitted changes make build injected the bare HEAD SHA, so a build from a tree with changes reported a clean-looking commit, while go build marks it -dirty. The Makefile now appends -dirty on the same test Go uses for vcs.modified (git status --porcelain). Release builds are unchanged: the release workflow sets COMMIT itself. Co-Authored-By: Claude Opus 5.5 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 630e1c9..f1327b5 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,10 @@ export GOWORK := off APP_NAME = s7commctl APP_SRC = main.go ARCHS = linux/amd64 linux/arm64 linux/arm/v7 darwin/amd64 darwin/arm64 windows/amd64 windows/arm64 -COMMIT := $(shell git rev-parse HEAD 2>/dev/null) +# -dirty when the working tree has changes, as Go itself marks vcs.modified +# (git status --porcelain, untracked files included); empty outside git. +DIRTY := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] || echo -dirty) +COMMIT := $(shell git rev-parse HEAD 2>/dev/null)$(DIRTY) BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") TAG := $(shell git describe --tags --exact-match 2>/dev/null || echo "") # VERSION and TAG only when HEAD is exactly on a tag (leading v stripped); otherwise the