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

Resolves #766 -- use same method post command validation so o/main works

Browse source
This commit is contained in:
Peter Cottle 2020-12-29 08:52:42 -07:00
parent 2802ce3b59
commit 7be578699d
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -447,8 +447,8 @@ var commandConfig = {
assertIsRemoteBranch(engine, remoteBranch); assertIsRemoteBranch(engine, remoteBranch);
assertIsBranch(engine, branch); assertIsBranch(engine, branch);
engine.setLocalToTrackRemote( engine.setLocalToTrackRemote(
engine.refs[branch], engine.resolveID(branch),
engine.refs[remoteBranch] engine.resolveID(remoteBranch)
); );
return; return;
} }

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

@ -472,6 +472,7 @@ GitEngine.prototype.makeBranchOnOriginAndTrack = function(branchName, target) {
}; };
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) { GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
debugger;
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id')); localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) { if (!this.command) {

1
src/js/models/commandModel.js
View file

@ -269,7 +269,6 @@ var Command = Backbone.Model.extend({
parseAll: function() { parseAll: function() {
var rawInput = this.get('rawStr'); var rawInput = this.get('rawStr');
debugger;
const aliasMap = LevelStore.getAliasMap(); const aliasMap = LevelStore.getAliasMap();
for (var i = 0; i<Object.keys(aliasMap).length; i++) { for (var i = 0; i<Object.keys(aliasMap).length; i++) {
var alias = Object.keys(aliasMap)[i]; var alias = Object.keys(aliasMap)[i];