summaryrefslogtreecommitdiffstats
path: root/git-hooks/post-merge
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-07-31 10:56:52 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-07-31 11:22:03 +0200
commit1a39024190329a002be034d29979e1e8e5902607 (patch)
tree6f258d7c748159ea6fc190801d76762fb4fa0362 /git-hooks/post-merge
parent2a5acd0882180dd5a25d25112594330bbce96c51 (diff)
Install git hooks as relative symlinks
Absolute symlinks break when the installation is moved on the server and provide no value. Also update the post-merge hook so that it performs this change. Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'git-hooks/post-merge')
-rwxr-xr-xgit-hooks/post-merge4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 358290088..1fc8b582c 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -14,6 +14,10 @@ if [ ! $fresh_clone ] && [[ -z "$changes" ]]; then
exit
fi
+if echo "$changes" | grep scripts/install-git-hooks.sh; then
+ scripts/install-git-hooks.sh
+fi
+
# Make sure submodules are up to date
git submodule update --init --recursive