From b472f191265ab6fd3a314e724f77f5545749f4c9 Mon Sep 17 00:00:00 2001 From: Bart Van Bos Date: Sun, 8 Nov 2026 09:05:33 +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 dffcaf4..7627438 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,10 @@ RELEASE_DIR = release # Override on the command line or in CI (matches the ldflags of the release workflow). VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null) TAG ?= $(shell git describe --tags --exact-match 2>/dev/null) -COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null || echo "") +# -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 || echo "")$(DIRTY) BUILD_DATE ?= $(shell date -u '+%Y-%m-%dT%H:%M:%SZ') LDFLAGS = -ldflags "-s -w -X main.version=$(VERSION) -X main.tag=$(TAG) -X main.commit=$(COMMIT) -X main.buildDate=$(BUILD_DATE)"