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

ugh annoying teardown bug

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 13:16:30 -07:00
parent 33e5060ac7
commit 906216d98b
5 changed files with 135 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,12 +339,19 @@ GitEngine.prototype.makeOrigin = function(treeString) {
this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}, this);
// 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) {
var originTarget = branchJSON.target;
// now this is tricky -- our remote could have commits that we do
// not have. so lets go upwards until we find one that we have
while (!this.refs[originTarget]) {
var parents = originTree.commits[originTarget].parents;
originTarget = parents[0];
}
// now we have something in common, lets make the tracking branch
var originBranch = this.makeBranch(
ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget)
@ -358,6 +365,11 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
remoteBranch.addLocalBranchThatTracksThis(localBranch);
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) {
// during init we have no command
return;
}
// same for local TODO intl
var msg = 'local branch "' +
localBranch.get('id') +
@ -436,8 +448,12 @@ GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
};
GitEngine.prototype.tearDown = function() {
if (this.tornDown) {
return;
}
this.eventBaton.releaseBaton('processGitCommand', this.dispatch, this);
this.removeAll();
this.tornDown = true;
};
GitEngine.prototype.reloadGraphics = function() {