Changeset 3440 for trunk

Timestamp:

Sep 25, 2024, 5:51:15 PM (2 months ago)

Author:

afalco

Message:

general: interactive git svn dcommit.
AF

File:

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

trunk/UTIL/pre-push

@@ -5 +5 @@
 local_branch=$(git branch --show-current)
 if [ ${local_branch} != "master" ]; then
-    git checkout master # ensure master is in sync with svn
+    # exit 0 # if on other branch than master, do not sync with svn
+    git checkout master
+    git pull origin master
 fi
 # git update-ref refs/remotes/git-svn refs/remotes/origin/master # what's this supposed to do?
@@ -45 +47 @@
 
 ### commit changes to svn
-git svn dcommit
+git svn dcommit < /dev/tty
 COMMITED=$?
 if [ $COMMITED != 0 ] # check if rebase worked