Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MINOR Phing checkout bug when branch doesn't exist

Solved by using --force instead, which hard resets to the tracking origin
  • Loading branch information...
commit 029c14b30aff2b2bf8cf86e07c92f95d4d9d7fee 1 parent 04cf94f
Ingo Schommer authored June 25, 2012

Showing 1 changed file with 1 addition and 2 deletions. Show diff stats Hide diff stats

  1. 3  build.xml
3  build.xml
@@ -421,8 +421,7 @@ Your friendly automated release script.
421 421
 
422 422
 		<exec command="git checkout master" dir="${module}" checkreturn="true" />
423 423
 		<exec command="git fetch origin" dir="${module}" checkreturn="true" />
424  
-		<exec command="git branch -D translation-staging" dir="${module}" checkreturn="true" />
425  
-		<exec command="git branch --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
  424
+		<exec command="git branch --force --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
426 425
 		<exec command="git checkout translation-staging" dir="${module}" checkreturn="true" />
427 426
 	</target>
428 427
 

0 notes on commit 029c14b

Please sign in to comment.
Something went wrong with that request. Please try again.