Merge pull request #373 from acquia/deploy-multiple-bug

Fixing multiple deployment target bug.
acquia · Sep 9, 2016 · 980546c · 980546c
2 parents 7f1c7a1 + 26b12ed
commit 980546c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
@@ -59,7 +59,8 @@
     <exec command="git fetch ${remoteName} ${deploy.branch}" dir="${deploy.dir}" logoutput="true" level="info" passthru="true"/>
 
     <!-- Create the new branch, "[source-branch-name]-build". -->
-    <exec command="git checkout -b ${deploy.branch}" dir="${deploy.dir}" logoutput="true" checkreturn="true" level="info" passthru="true"/>
+    <!-- We intentionally use checkreturn="false" in case the branch already exists. `git checkout -B` does not seem to work as advertised -->
+    <exec command="git checkout -b ${deploy.branch}" dir="${deploy.dir}" logoutput="true" checkreturn="false" level="info" passthru="true"/>
 
     <!-- Pull the latest updates (if available). -->
     <exec command="git merge ${remoteName}/${deploy.branch}" dir="${deploy.dir}" logoutput="true" passthru="true"/>