summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2025-08-01 14:46:58 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2026-06-12 18:19:18 +0900
commit81a7856dd893aab74ff5562aa6d90aa7ec70c05f (patch)
tree7765c72c7b1e115d9e2d404bc4fcf54d4bea793c /Makefile.am
parente6566646240708a8e65e69a9ba6570f67bb7e986 (diff)
Revert "build: Add a commit-msg hook that embeds Change-Id in commit messages."
This reverts commit 8005e09b261d65bf0f7469cd8e89423c1c1db820 and follow-ups. This was added 2 years ago to be able to trace commits between the git repository and the guix-patches tracker, and to implement a solution to automatically close merged commits (which has not materialized). Since we have now migrated to Codeberg, the cross-referencing between reviewed commits (pull requests) and the actual commits merged can be done in the Codeberg UI (via the 'manually merged' option), and Codeberg also supports closing a bug via the "Fixes: #NNN" git trailer, and as a convention we can add a "Merges: !NNN" git trailer in a commit closing a PR (the actual closing is not yet implemented by Forgejo), which mostly obsoletes the purpose of the Change-Id git trailer.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am14
1 files changed, 1 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index d349fcaa383..416c958b202 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
20# Copyright © 2023 Clément Lassieur <clement@lassieur.org> 20# Copyright © 2023 Clément Lassieur <clement@lassieur.org>
21# Copyright © 2023, 2024 Wilko Meyer <w@wmeyer.eu> 21# Copyright © 2023, 2024 Wilko Meyer <w@wmeyer.eu>
22# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> 22# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
23# Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
24# Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de> 23# Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
25# 24#
26# This file is part of GNU Guix. 25# This file is part of GNU Guix.
@@ -1295,16 +1294,6 @@ $(GIT_CONFIG_FILE): etc/git/gitconfig
1295 ../etc/git/gitconfig ../etc/git/gitconfig; \ 1294 ../etc/git/gitconfig ../etc/git/gitconfig; \
1296 fi 1295 fi
1297 1296
1298COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
1299$(GIT_HOOKS_DIR)/commit-msg: etc/git/commit-msg | $(GIT_HOOKS_DIR)
1300 if [ -n "$(GIT_HOOKS_DIR)" ]; then \
1301 if test -f $@ && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \
1302 mkdir -p $@.d && mv $@ $@.d && \
1303 echo user commit-msg hook moved to $@.d/commit-msg; \
1304 fi && \
1305 cp etc/git/commit-msg $@; \
1306 fi
1307
1308# Convenience targets. 1297# Convenience targets.
1309GIT_HOOKS_SOURCE_FILES := $(shell find etc/git -type f -executable) 1298GIT_HOOKS_SOURCE_FILES := $(shell find etc/git -type f -executable)
1310.PHONY: git-config git-hooks invalidate-hooks 1299.PHONY: git-config git-hooks invalidate-hooks
@@ -1317,8 +1306,7 @@ git-config: $(GIT_CONFIG_FILE) git-hooks
1317nodist_noinst_DATA = \ 1306nodist_noinst_DATA = \
1318 $(GIT_HOOKS_DIR)/pre-push \ 1307 $(GIT_HOOKS_DIR)/pre-push \
1319 $(GIT_HOOKS_DIR)/post-merge \ 1308 $(GIT_HOOKS_DIR)/post-merge \
1320 $(GIT_CONFIG_FILE) \ 1309 $(GIT_CONFIG_FILE)
1321 $(GIT_HOOKS_DIR)/commit-msg
1322endif 1310endif
1323 1311
1324# Downloading up-to-date PO files. 1312# Downloading up-to-date PO files.