Browse files

MINOR Phing checkout bug when branch doesn't exist

Solved by using --force instead, which hard resets to the tracking origin
  • Loading branch information...
1 parent 04cf94f commit 029c14b30aff2b2bf8cf86e07c92f95d4d9d7fee @chillu chillu committed Jun 25, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 build.xml
View
3 build.xml
@@ -421,8 +421,7 @@ Your friendly automated release script.
<exec command="git checkout master" dir="${module}" checkreturn="true" />
<exec command="git fetch origin" dir="${module}" checkreturn="true" />
- <exec command="git branch -D translation-staging" dir="${module}" checkreturn="true" />
- <exec command="git branch --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
+ <exec command="git branch --force --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
<exec command="git checkout translation-staging" dir="${module}" checkreturn="true" />
</target>

0 comments on commit 029c14b

Please sign in to comment.