Changeset 3414 for trunk/UTIL

Timestamp:

Aug 21, 2024, 3:46:56 PM (4 months ago)

Author:

afalco

Message:

git init in UTIL/ dir + README. AF

Location:

trunk/UTIL

Files:

• git_init.sh (moved) (moved from trunk/git_init.sh) (3 diffs)
• pre-push (modified) (1 diff)

trunk/UTIL/git_init.sh

@@ -1 @@
-# Script to initialize the git repository from a svn repo
-# WARNING: we assume the svn and the git to be 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
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd ${SCRIPT_DIR}/..
 
 echo "WARNING: this script will setup the git repo"
@@ -24 +28 @@
 # (need git-svn to work)
 git svn init https://svn.lmd.jussieu.fr/Planeto/trunk
-GITSVN=$?
-if [ $GITSVN != 0 ]
-then
-    printf "${RED}Error with git-svn init.${NC}\n"
-    printf "${RED}Please check if git-svn is installed.${NC}\n"
-    exit $GITSVN
-fi
 
 git update-ref refs/remotes/git-svn refs/remotes/origin/master
@@ -37 +34 @@
 # install pre-push hook to ensure
 # users push only commits in sync with svn
+
 ln UTIL/pre-push .git/hooks

trunk/UTIL/pre-push

@@ -55 +55 @@
 GITSVN=$(git rev-parse git-svn)
 echo "local is at $HEAD"
-echo "svn   is
- at $GITSVN"
+echo "svn   is at $GITSVN"
 if [ "$HEAD" != "$GITSVN" ] # check if dcommit changed hashes
 then