summaryrefslogtreecommitdiffstats
path: root/git-hooks/post-merge
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-06-16 13:41:24 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-06-16 13:41:24 +0200
commit2448b2136b8c9904e44bd6e07bda5dc7f97eece1 (patch)
tree56338a4a70363dd7c0cf35cabb8a9043a4ceb846 /git-hooks/post-merge
parent9dd62687bff19b099fd6a4b45410b9060056daa9 (diff)
post-merge: Update git submodules after pulling
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'git-hooks/post-merge')
-rwxr-xr-xgit-hooks/post-merge3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 02583897f..358290088 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -14,6 +14,9 @@ if [ ! $fresh_clone ] && [[ -z "$changes" ]]; then
exit
fi
+# Make sure submodules are up to date
+git submodule update --init --recursive
+
# Update databse
php index.php tools update_database