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

gah was forgetting origin assert

Browse source
This commit is contained in:
Peter Cottle 2013-10-26 13:44:52 -07:00
parent 1e5181689d
commit 55d563a9bc
5 changed files with 86 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,9 @@ var assertIsRemoteBranch = function(engine, ref) {
};
var assertOriginSpecified = function(generalArgs) {
if (!generalArgs.length) {
return;
}
if (generalArgs[0] !== 'origin') {
throw new GitError({
msg: intl.todo(
@ -208,7 +211,7 @@ var commandConfig = {
var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
command.twoArgsForOrigin(generalArgs);
assertOriginSpecified(generalArgs);
// here is the deal -- git pull is pretty complex with
// the arguments it wants. You can
@ -331,7 +334,7 @@ var commandConfig = {
var source;
var destination;
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
command.twoArgsForOrigin(generalArgs);
assertOriginSpecified(generalArgs);
var firstArg = generalArgs[1];
@ -677,7 +680,7 @@ var commandConfig = {
// git push is pretty complex in terms of
// the arguments it wants as well... get ready!
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
command.twoArgsForOrigin(generalArgs);
assertOriginSpecified(generalArgs);
var firstArg = generalArgs[1];

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

@ -140,11 +140,8 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
twoArgsForOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again