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

now rebase coverage

Browse source
This commit is contained in:
Peter Cottle 2013-08-04 14:35:38 -07:00
parent cb47dd2728
commit 6a48f2fff4
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2383,8 +2383,19 @@ var Commit = Backbone.Model.extend({
this.removeFromParents();
this.set('parents', [newParent]);
newParent.get('children').push(this);
this.get('visNode').removeAllEdges();
this.get('gitVisuals').addEdge(this.get('id'), newestID);
// when we run in test mode, our visnode and
// visuals will be undefined so we need to check for their existence
var visNode = this.get('visNode');
if (visNode) {
visNode.removeAllEdges();
}
var gitVisuals = this.get('gitVisuals');
if (gitVisuals) {
gitVisuals.addEdge(this.get('id'), newestID);
}
return true;
},