From f682f42aa0ac25a0dc1a39557eed2beb007f84a8 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@fb.com>
Date: Fri, 5 Jul 2013 09:58:57 -0700
Subject: [PATCH] starting on push bug for git merge C3;git merge master;go
 master;git merge side;git push;gc; git reset HEAD~1; git clone; gc; git merge
 C2; git push;

---
 src/js/git/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/js/git/index.js b/src/js/git/index.js
index 17bb57fb..2ad04560 100644
--- a/src/js/git/index.js
+++ b/src/js/git/index.js
@@ -265,9 +265,8 @@ GitEngine.prototype.makeOrigin = function(treeString) {
     AnimationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
   }, this);
 
-  // TODO handle the case where the master target on origin is not present
-  // locally, so we have to go up the chain. for now we assume the master on
-  // origin is at least present.
+  // we only clone from our current state, so we can safely assume all of our
+  // local commits are on origin
   var originTree = JSON.parse(unescape(treeString));
   // make an origin branch for each branch mentioned in the tree
   _.each(originTree.branches, function(branchJSON, branchName) {
@@ -1162,7 +1161,6 @@ GitEngine.prototype.fakeTeamwork = function(numToMake, branch) {
       this.origin.gitVisuals
     );
   }, this);
-  var chainStepWrap = function() { return chainStep(); };
 
   var deferred = Q.defer();
   var chain = deferred.promise;