Support --no-ff

jxlxj · Feb 14, 2015 · fc69b17 · fc69b17
1 parent 5320480
commit fc69b17
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/js/controlbox.js b/js/controlbox.js
@@ -279,8 +279,18 @@ define(['d3'], function () {
         },
 
         merge: function (args) {
+            var noFF = false;
+            if (args.length == 2)
+            {
+                var mergeSwitch = args.pop();
+                if (mergeSwitch === '--no-ff') {
+                    noFF = true;
+                } else {
+                    this.info('This demo only supports the --no-ff switch..');
+                }
+            }
             var ref = args.shift(),
-                result = this.historyView.merge(ref);
+                result = this.historyView.merge(ref, noFF);
 
             if (result === 'Fast-Forward') {
                 this.info('You have performed a fast-forward merge.');

diff --git a/js/historyview.js b/js/historyview.js
@@ -939,7 +939,7 @@ define(['d3'], function () {
             }
         },
 
-        merge: function (ref) {
+        merge: function (ref, noFF) {
             var mergeTarget = this.getCommit(ref),
                 currentCommit = this.getCommit('HEAD');
 
@@ -951,7 +951,7 @@ define(['d3'], function () {
                 throw new Error('Already up-to-date.');
             } else if (currentCommit.parent2 === mergeTarget.id) {
                 throw new Error('Already up-to-date.');
-            } else if (this.isAncestor(currentCommit, mergeTarget)) {
+            } else if (this.isAncestor(currentCommit, mergeTarget) && noFF !== true) {
                 this.fastForward(mergeTarget);
                 return 'Fast-Forward';
             } else {