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

in th emiddle of transitioning to box flex

Browse source
This commit is contained in:
Peter Cottle 2012-09-16 12:16:27 -07:00
parent f0e45deb1e
commit fb2a1325c6
7 changed files with 108 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/git.js
View file

@ -1,4 +1,3 @@
// backbone or something uses _.uniqueId, so we make our own here
var uniqueId = (function() {
var n = 0;
@ -799,7 +798,8 @@ var Branch = Ref.extend({
var Commit = Backbone.Model.extend({
defaults: {
type: 'commit',
children: []
children: [],
parents: []
},
validateAtInit: function() {
@ -808,9 +808,7 @@ var Commit = Backbone.Model.extend({
}
// root commits have no parents
if (this.get('rootCommit')) {
this.set('parents', []);
} else {
if (!this.get('rootCommit')) {
if (!this.get('parents') || !this.get('parents').length) {
throw new Error('needs parents');
}