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

BOOM all tests pass, more progress on git fetch

Browse source
This commit is contained in:
Peter Cottle 2013-10-17 19:49:17 -07:00
parent b9ebaca62b
commit f11f76bbe8
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -374,7 +374,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
GitEngine.prototype.makeRemoteBranchForRemote = function(branchName) {
var target = this.origin.refs[branchName].get('target');
var originTarget = this.findCommonAncestorWithRemote(
target.get('id');
target.get('id')
);
return this.makeBranch(
ORIGIN_PREFIX + branchName,
@ -1037,7 +1037,7 @@ GitEngine.prototype.fetch = function(options) {
// ok this is just like git push -- if the destination does not exist,
// we need to make it
if (options.destination) {
if (options.destination && !this.refs[options.destination]) {
// its just like creating a branch, we will merge (if pulling) later
this.validateAndMakeBranch(
options.destination,
@ -1051,9 +1051,11 @@ GitEngine.prototype.fetch = function(options) {
if (options.source) {
// gah -- first we have to check that we even have a remote branch
// for this source (we know its on the remote based on validation)
if (!this.refs[ORIGIN_PREFX + options.source]) {
if (!this.refs[ORIGIN_PREFIX + options.source]) {
this.makeRemoteBranchForRemote(options.source);
}
// now just specify branches to fetch based on this source
branchesToFetch = [this.refs[ORIGIN_PREFIX + options.source]];
} else {
branchesToFetch = this.branchCollection.filter(function(branch) {
return branch.getIsRemote();