Review git hook

GeotrekCE · May 24, 2022 · 7132b43 · 7132b43
1 parent 85ed47c
commit 7132b43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.githooks/pre-push b/.githooks/pre-push
@@ -5,7 +5,7 @@ current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
 
 if [ $protected_branch = $current_branch ]
 then
-    read -p "You're about to push to 'master', is that what you intended? [y|n] " -n 1 -r < /dev/tty
+    read -p "You're about to push to '$protected_branch', is that what you intended? [y|n] " -n 1 -r < /dev/tty
     echo
     if echo $REPLY | grep -E '^[Yy]$' > /dev/null
     then

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -27,7 +27,7 @@ CHANGELOG
 
 **Maintenance**
 
-- Add a git hook to prevent pushing to master. To enable it, developpers should run the following command from root directory : `ln -s -f ../../.githooks/pre-push .git/hooks/pre-push`
+- Add a git hook to prevent pushing to master.
 - Update to paperclip 2.5.0
 
 

diff --git a/docs/contribute/development.rst b/docs/contribute/development.rst
@@ -31,7 +31,7 @@ Conventions
 * KISS & DRY as much as possible
 * Elegant and generic is good, simple is better
 * Commits messages are explicit and mention issue number (``(ref #12)`` or ``(fixes #23)``)
-* Features are developed in a branch and merged from Github pull-requests.
+* Features are developed in a branch and merged from Github pull-requests. A git hook to is available to prevent pushing to master, to enable it, developpers should run the following command from root directory (`Geotrek-admin/`) : `ln -s -f ../../.githooks/pre-push .git/hooks/pre-push`
 
 
 Definition of done