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

ugly ugly bug with circular fields

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 15:12:21 -07:00
parent 1ed8a2524a
commit bbf837a4b2
6 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -363,7 +363,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
};
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
remoteBranch.addLocalBranchThatTracksThis(localBranch);
remoteBranch.addLocalBranchThatTracksThis(localBranch.get('id'));
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) {