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

get rid of local branches that trick this since not needed

Browse source
This commit is contained in:
Peter Cottle 2013-10-09 21:40:44 -07:00
parent b2321dd265
commit 748eddbd86
3 changed files with 18 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
};
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
remoteBranch.addLocalBranchThatTracksThis(localBranch.get('id'));
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) {
@ -2439,7 +2438,6 @@ var Branch = Ref.extend({
defaults: {
visBranch: null,
remoteTrackingBranchID: null,
localBranchesThatTrackThis: null,
remote: false
},
@ -2466,20 +2464,6 @@ var Branch = Ref.extend({
return this.get('remoteTrackingBranchID');
},
addLocalBranchThatTracksThis: function(localBranch) {
this.setLocalBranchesThatTrackThis(
this.getLocalBranchesThatTrackThis().concat([localBranch])
);
},
setLocalBranchesThatTrackThis: function(branches) {
this.set('localBranchesThatTrackThis', branches);
},
getLocalBranchesThatTrackThis: function() {
return this.get('localBranchesThatTrackThis') || [];
},
getPrefixedID: function() {
if (this.getIsRemote()) {
throw new Error('im already remote');