mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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;

Browse source
This commit is contained in:
Peter Cottle 2013-07-05 09:58:57 -07:00
parent cb54364d6a
commit f682f42aa0
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/git/index.js
View file

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