diff options
| author | Luca Boccassi <bluca@debian.org> | 2024-04-10 23:52:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 23:52:45 +0200 |
| commit | 6dfaa0edaff5f2f1e26012be47e0a4d228b04dcb (patch) | |
| tree | 489037a8109b40e5834fe3571dcd0ce46f570b7f | |
| parent | Merge pull request #32205 from YHNdnzj/bless-boot (diff) | |
| parent | git: Add post-rewrite hook that invokes git submodule update (diff) | |
| download | systemd-6dfaa0edaff5f2f1e26012be47e0a4d228b04dcb.tar.xz systemd-6dfaa0edaff5f2f1e26012be47e0a4d228b04dcb.zip | |
Merge pull request #32204 from DaanDeMeyer/post-rewrite
git: Add post-rewrite hook that invokes git submodule update
| -rw-r--r-- | docs/HACKING.md | 2 | ||||
| m--------- | pkg/centos | 0 | ||||
| m--------- | pkg/fedora | 0 | ||||
| -rwxr-xr-x | tools/git-post-rewrite-hook.sh | 4 | ||||
| -rwxr-xr-x | tools/git-setup.sh | 19 |
5 files changed, 20 insertions, 5 deletions
diff --git a/docs/HACKING.md b/docs/HACKING.md index 33d32c9119..2a58780fbf 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -21,6 +21,8 @@ git correctly (running `meson` will run these commands for you automatically): $ git config submodule.recurse true $ git config fetch.recurseSubmodules on-demand $ git config push.recurseSubmodules no +$ cp .git/hooks/pre-commit.sample .git/hooks/pre-commit +$ cp tools/git-post-rewrite-hook.sh .git/hooks/post-rewrite ``` When adding new functionality, tests should be added. For shared functionality diff --git a/pkg/centos b/pkg/centos -Subproject 282d1f30a64204630e96bcf048597f6afbe4a8b +Subproject ad880b10ee6bbfbe266c518fc87b8c7a3df962d diff --git a/pkg/fedora b/pkg/fedora -Subproject 3f8c38e5d6481fa01e766516cbdf7779c4a2825 +Subproject 2822a03dded26b9453bddbba7c6a152de8204ae diff --git a/tools/git-post-rewrite-hook.sh b/tools/git-post-rewrite-hook.sh new file mode 100755 index 0000000000..78feb9dbba --- /dev/null +++ b/tools/git-post-rewrite-hook.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# SPDX-License-Identifier: LGPL-2.1-or-later + +exec git submodule update diff --git a/tools/git-setup.sh b/tools/git-setup.sh index 4b49ab9c45..a53f1790c1 100755 --- a/tools/git-setup.sh +++ b/tools/git-setup.sh @@ -10,10 +10,19 @@ if [ -e .git ]; then git config push.recurseSubmodules no fi -if [ ! -f .git/hooks/pre-commit.sample ] || [ -f .git/hooks/pre-commit ]; then - exit 2 # not needed +ret=2 + +if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit + chmod +x .git/hooks/pre-commit + echo 'Activated pre-commit hook' + ret=0 +fi + +if [ ! -f .git/hooks/post-rewrite ]; then + cp -p tools/git-post-rewrite-hook.sh .git/hooks/post-rewrite + echo 'Activated post-rewrite hook' + ret=0 fi -cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit -chmod +x .git/hooks/pre-commit -echo 'Activated pre-commit hook' +exit $ret |