Changeset 3575

Timestamp:

Jan 14, 2025, 3:11:01 PM (11 hours ago)

Author:

afalco

Message:

git-svn: added hooks on other operations such as merge and checkout, to synchronize git and svn more often (not just git push).

Unfortunately, "git pull" will still not call the hook if there are no changes on git remote master.
AF

Location:

trunk/UTIL

Files:

• git_init.sh (modified) (2 diffs)
• hooks (added)
• hooks/post-checkout (added)
• hooks/post-merge (added)
• hooks/pre-push (added)

trunk/UTIL/git_init.sh

@@ -14 +14 @@
 # echo "or download it in the git-trunk/ folder (and link with git-svn)."
 
-while true; do
-    read -p "Do you wish to continue? [Y/n] " yn
-    case $yn in
-        [Yy]* ) break;;
-        [Nn]* ) exit;;
-        * ) break;;
-    esac
-done
+# while true; do
+#     read -p "Do you wish to continue? [Y/n] " yn
+#     case $yn in
+#         [Yy]* ) break;;
+#         [Nn]* ) exit;;
+#         * ) break;;
+#     esac
+# done
 
 # URL=git@gitlab.in2p3.fr:la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk.git
@@ -40 +40 @@
 ### users push only commits in sync with svn
 
-cp UTIL/pre-push .git/hooks
+# save users hooks just in case
+echo "Saving old hooks in .git/hooks/save ..."
+mkdir -p .git/hooks
+if [ -d .git/hooks ];then
+    mkdir -p .git/hooks/save
+    mv .git/hooks/p* .git/hooks/save
+fi
+echo "Copying lmdz hooks in .git/hooks ..."
+cd .git/hooks
+for hook in ../../UTIL/hooks/*; do
+    file=$(basename $hook)
+    echo $file
+    ln -s $hook $file
+done