[GRASS-SVN] r74176 - grass-addons/tools/svn2git

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-03-07 09:31:53 -0800 (Thu, 07 Mar 2019)
New Revision: 74176

Modified:
   grass-addons/tools/svn2git/1-migrate-core.sh
Log:
svn2git: restore master branch in grass-legacy

Modified: grass-addons/tools/svn2git/1-migrate-core.sh
===================================================================
--- grass-addons/tools/svn2git/1-migrate-core.sh	2019-03-07 16:07:02 UTC (rev 74175)
+++ grass-addons/tools/svn2git/1-migrate-core.sh	2019-03-07 17:31:53 UTC (rev 74176)
@@ -18,10 +18,8 @@
         git checkout $branch
     done
     git branch -D master
-    if [ $DIR = "grass" ] ; then
-        git branch master origin/trunk
-        git checkout master
-    fi
+    git branch master origin/trunk
+    git checkout master
 
     # Rename tags
     if [ $DIR = "grass" ] ; then
@@ -42,9 +40,7 @@
         GIT_COMMITTER_DATE="$d" git tag -a $j -m "Tagging release $j" $h
     done
 
-    if [ $DIR = "grass" ] ; then
-        git checkout master
-    fi
+    git checkout master
     for i in `git branch | grep tags`; do
         git branch -D $i
     done