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

WIP bad

Browse source
This commit is contained in:
Peter Cottle 2013-10-12 23:07:14 -07:00
parent 068b9b961e
commit 9bf99ebff3
2 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,15 +366,32 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}
// now we have something in common, lets make the tracking branch
var originBranch = this.makeBranch(
var remoteBranch = this.makeBranch(
ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget)
);
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
this.setLocalToTrackRemote(this.refs[branchJSON.id], remoteBranch);
}, this);
};
GitEngine.prototype.makeBranchOnOriginAndTrack = function(branchName, target) {
var remoteBranch = this.makeBranch(
ORIGIN_PREFIX + branchName,
this.getCommitFromRef(target)
);
if (this.refs[branchName]) { // not all remote branches have tracking ones
this.setLocalToTrackRemote(this.refs[branchName], remoteBranch);
}
var originTarget = this.origin.refs['master'].get('target');
this.origin.makeBranch(
branchName,
originTarget
);
};
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
@ -859,16 +876,28 @@ GitEngine.prototype.descendSortDepth = function(objects) {
GitEngine.prototype.push = function(options) {
options = options || {};
var remoteBranch = this.refs[options.destination];
var branchOnRemote = this.origin.refs[remoteBranch.getBaseID()];
if (options.source === "") {
// delete case
this.pushDeleteRemoteBranch(remoteBranch, branchOnRemote);
this.pushDeleteRemoteBranch(
this.refs[ORIGIN_PREFIX + options.destination],
this.origin.refs[options.destination]
);
return;
}
var remoteBranch = this.refs[options.source];
if (!this.origin.refs[options.destination]) {
this.makeBranchOnOriginAndTrack(
options.destination,
'HEAD'
);
}
var branchOnRemote = this.origin.refs[options.source];
var sourceLocation = this.getOneBeforeCommit(options.source || 'HEAD');
debugger;
// first check if this is even allowed by checking the sync between
this.checkUpstreamOfSource(
this,