Item11483: force the push upon creation, in case it already existed a…

…nd would not fast-forward git-svn-id: http://svn.foswiki.org/trunk@13898 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 2, 2012 · 0ca0aa3 · 0ca0aa3
1 parent cbaa8b4
commit 0ca0aa3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/tools/develop/hooks/git-svn-split.pl b/core/tools/develop/hooks/git-svn-split.pl
@@ -150,10 +150,11 @@ sub getSubModule {
         $submodule->run( checkout => $branch );
 
         # Create local branch if it doesn't exist
-        unless( eval { $submodule->run( 'symbolic-ref' => 'HEAD' ) } ) {
+        unless ( eval { $submodule->run( 'symbolic-ref' => 'HEAD' ) } ) {
             $submodule->run( checkout => '-b' => $branch );
+            $submodule->run( push => '-f', origin => $branch );
         }
-        $submodule->run( svn      => 'rebase' );
+        $submodule->run( svn => 'rebase' );
     }
     $submodule->run( push => '--all' );
 }