Make Git merges succeed only when fast forwarding. Closes #13

InCommon · Aug 11, 2016 · 6493d30 · 6493d30
1 parent ef4fe8d
commit 6493d30
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/build.xml b/build.xml
@@ -702,6 +702,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="deferred"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging deferred branch into immediate branch.'"/>
         </exec>
@@ -719,6 +720,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="immediate"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immediate branch into master branch.'"/>
         </exec>
@@ -736,6 +738,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="master"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging master branch into immediate branch.'"/>
         </exec>
@@ -753,6 +756,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="immediate"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immedate branch into deferred branch.'"/>
         </exec>
@@ -770,6 +774,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="master"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immedate branch into deferred branch.'"/>
         </exec>
@@ -787,6 +792,7 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="deferred"/>
+            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immedate branch into deferred branch.'"/>
         </exec>