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

Resolves #768 -- fix pull arguments (same issue)

Browse source
This commit is contained in:
Peter Cottle 2020-12-30 09:20:03 -07:00
parent a530dcbb16
commit 8a159ea498
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -253,7 +253,7 @@ var commandConfig = {
source = firstArg; source = firstArg;
assertIsBranch(engine.origin, source); assertIsBranch(engine.origin, source);
// get o/master locally if master is specified // get o/master locally if master is specified
destination = engine.origin.refs[source].getPrefixedID(); destination = engine.origin.resolveID(source).getPrefixedID();
} else { } else {
// can't be detached // can't be detached
if (engine.getDetachedHead()) { if (engine.getDetachedHead()) {

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

@ -405,7 +405,7 @@ GitEngine.prototype.makeBranchIfNeeded = function(branchName) {
}; };
GitEngine.prototype.makeRemoteBranchForRemote = function(branchName) { GitEngine.prototype.makeRemoteBranchForRemote = function(branchName) {
var target = this.origin.refs[branchName].get('target'); var target = this.origin.resolveID(branchName).get('target');
var originTarget = this.findCommonAncestorWithRemote( var originTarget = this.findCommonAncestorWithRemote(
target.get('id') target.get('id')
); );
@ -1313,7 +1313,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
// need to get the parents first. since we order by depth, we know // need to get the parents first. since we order by depth, we know
// the dependencies are there already // the dependencies are there already
var parents = parentIDs.map(function(parentID) { var parents = parentIDs.map(function(parentID) {
return this.refs[parentID]; return this.resolveID(parentID);
}, this); }, this);
return this.makeCommit(parents, id); return this.makeCommit(parents, id);
}.bind(this); }.bind(this);
@ -1345,7 +1345,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
chain = chain.then(function() { chain = chain.then(function() {
return this.animationFactory.playHighlightPromiseAnimation( return this.animationFactory.playHighlightPromiseAnimation(
this.origin.refs[commitJSON.id], this.origin.resolveID(commitJSON.id),
localBranch localBranch
); );
}.bind(this)); }.bind(this));
@ -1361,7 +1361,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
chain = chain.then(function() { chain = chain.then(function() {
// update all the destinations // update all the destinations
sourceDestPairs.forEach(function (pair) { sourceDestPairs.forEach(function (pair) {
var ours = this.refs[pair.destination]; var ours = this.resolveID(pair.destination);
var theirCommitID = this.origin.getCommitFromRef(pair.source).get('id'); var theirCommitID = this.origin.getCommitFromRef(pair.source).get('id');
// by definition we just made the commit with this id, // by definition we just made the commit with this id,
// so we can grab it now // so we can grab it now