From bc9f2efaa80b54cf346a789611e82fb2bc58d8ce Mon Sep 17 00:00:00 2001
From: Lasse Server <lasse@edfast.se>
Date: Mon, 3 Aug 2026 09:29:06 +0200
Subject: [PATCH] Add a make target for tracking fixes owed upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A deployment run as a fork will sometimes fix something in production first, because
production is what is broken. Those fixes are easy to forget, and a forgotten one is
how the two copies quietly diverge.

Commits carry an 'Upstream: yes' or 'Upstream: no — reason' trailer, and
`make upstream-pending` lists both what is marked and still owed, and what carries no
marker at all so the decision is visible rather than skipped.

Upstream: no — this is tooling for forks, but it belongs in the shared Makefile so
every deployment gets it rather than reinventing the wrapper.
---
 Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3d9685e..14669e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help setup dev backend frontend build test lint schema mcp check-fork-divergence
+.PHONY: help setup dev backend frontend build test lint schema mcp check-fork-divergence upstream-pending
 
 help:
 	@grep -E '^[a-z-]+:.*?## ' $(MAKEFILE_LIST) | awk -F':.*?## ' '{printf "  \033[36m%-22s\033[0m %s\n", $$1, $$2}'
@@ -45,3 +45,15 @@ check-fork-divergence: ## Verify the fork differs from upstream only under deplo
 	else \
 		echo "Fork is clean: no differences outside deploy/prod/."; \
 	fi
+
+upstream-pending: ## For a fork: list local commits marked "Upstream: yes" that upstream lacks
+	@git fetch --quiet upstream 2>/dev/null || { echo "No 'upstream' remote."; exit 1; }
+	@echo "Marked for upstream, not yet there:"
+	@git log --format='%h %s%n%b' upstream/main..HEAD 2>/dev/null \
+	  | awk '/^[0-9a-f]{7,} /{h=$$0} /^Upstream: *[Yy]es/{print "  " h}' \
+	  | grep . || echo "  (none)"
+	@echo
+	@echo "Unmarked — decide and amend, or ignore:"
+	@git log --format='%H%x09%h %s' upstream/main..HEAD 2>/dev/null | while IFS=$$'\t' read -r sha line; do \
+	  git log -1 --format='%B' "$$sha" | grep -qi '^Upstream:' || echo "  $$line"; \
+	done | grep . || echo "  (none)"