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

ugh ugly bug again with origin loading so sad

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 16:13:40 -07:00
parent 11074dba64
commit dd64536615
3 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -341,10 +341,15 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}, this);
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 if its
// not made already...
_.each(originTree.branches, function(branchJSON, branchName) {
var originTarget = branchJSON.target;
if (this.refs[ORIGIN_PREFIX + branchName]) {
// we already have this branch
return;
}
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]) {
@ -357,7 +362,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget)
);
console.log('made tracking branch', originBranch);
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
}, this);
@ -540,6 +544,10 @@ GitEngine.prototype.validateAndMakeBranch = function(id, target) {
};
GitEngine.prototype.makeBranch = function(id, target) {
if (this.refs[id]) {
throw new Error('woah already have that');
}
var branch = new Branch({
target: target,
id: id