Changeset 3445

Timestamp:

Sep 27, 2024, 6:54:42 PM (8 weeks ago)

Author:

afalco

Message:

general: git init script to install hook by a copy
instead of a link.
Accept automatically the copy.
AF

File:

• trunk/UTIL/git_init.sh (modified) (2 diffs)

trunk/UTIL/git_init.sh

@@ -1 @@
-# Script to initialize the git repository and link it to the svn.
-# The synchronization requires two pushes
-# (1st push=svn dcommit, 2nd push=git push)
-# WARNING: we assume the svn and the git are up-to-date
+## Script to initialize the git repository and link it to the svn.
+## The synchronization requires two pushes
+## (1st push=svn dcommit, 2nd push=git push)
+## WARNING: we assume the svn and the git are up-to-date
+## https://lmdz-forge.lmd.jussieu.fr/mediawiki/Planets/index.php/Git-svn
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd ${SCRIPT_DIR}/..
 
-echo "WARNING: this script will setup the git repo"
-echo "or download it in the git-trunk/ folder (and link with git-svn)."
+echo "WARNING: this script will setup the git repository."
+echo "It will connect the git to the svn (git svn init) and"
+echo "install a hook to ensure the synchronization between the two."
+echo "The hook (UTIL/pre-push) will be called at each git push."
+# 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
+    read -p "Do you wish to continue? [Y/n] " yn
     case $yn in
         [Yy]* ) break;;
         [Nn]* ) exit;;
-        * ) echo "Please answer yes (y) or no (n).";;
+        * ) break;;
     esac
 done
 
-URL=git@gitlab.in2p3.fr:la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk.git
-LOCAL_URL=`git remote get-url origin 2>/dev/null`
-if [ "${LOCAL_URL}" !=  "${URL}" ];then
-    git clone ${URL}
-    cd git-trunk
-fi
+# URL=git@gitlab.in2p3.fr:la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk.git
+# LOCAL_URL=`git remote get-url origin 2>/dev/null`
+# if [ "${LOCAL_URL}" !=  "${URL}" ];then
+#     git clone ${URL}
+#     cd git-trunk
+# fi
 
-# link svn to git as git-svn branch
-# (need git-svn to work)
+### link svn to git as git-svn branch
+### (need git-svn to work)
 git svn init https://svn.lmd.jussieu.fr/Planeto/trunk
 
@@ -32 +37 @@
 # git svn rebase # not used (we assume we're up-to-date)
 
-# install pre-push hook to ensure
-# users push only commits in sync with svn
+### install pre-push hook to ensure
+### users push only commits in sync with svn
 
-ln UTIL/pre-push .git/hooks
+cp UTIL/pre-push .git/hooks
+