Changeset 3415 for trunk/UTIL

Timestamp:

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

Author:

afalco

Message:

git-svn: pre-push hook launched from other branches too. AF

File:

• trunk/UTIL/pre-push (modified) (6 diffs)

trunk/UTIL/pre-push

@@ -3 +3 @@
 
 # check if on master
-if [ $(git branch --show-current) != "master" ]; then
-    exit 0 # if on other branch, do not care about the rest of the hook
-    # git checkout master # ensure master sync with svn
+local_branch=$(git branch --show-current)
+if [ ${local_branch} != "master" ]; then
+    git checkout master # ensure master is in sync with svn
 fi
 # git update-ref refs/remotes/git-svn refs/remotes/origin/master # what's this supposed to do?
@@ -15 +15 @@
 then
     printf "${RED}You need to install git svn to use this script.${NC}\n"
+    git checkout ${local_branch}
     exit $GITSVN
 fi
@@ -28 +29 @@
 then
     echo "${RED}git svn rebase failed.${NC}\n"
+    git checkout ${local_branch}
     exit $REBASED
 fi
@@ -48 +50 @@
 then
     printf "${RED}git svn dcommit failed.${NC}\n"
+    git checkout ${local_branch}
     exit $COMMITED
 fi
@@ -63 +66 @@
     printf "${RED}And synchronize svn and git.${NC}\n"
     printf "${RED}You will need to push again after.${NC}\n"
+    git checkout ${local_branch}
     exit 1
 fi
@@ -69 +73 @@
 
 # push only if svn was already up to date with local master
+git checkout ${local_branch}
 exit 0