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

now executing all codepaths for git push args, need to fix level still though

Browse source
This commit is contained in:
Peter Cottle 2013-10-15 17:36:29 -07:00
parent e99b6d7c61
commit e5b4ac5b1c
3 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -562,31 +562,33 @@ var commandConfig = {
}
var options = {};
var destination;
var source;
var sourceObj;
// git push is pretty complex in terms of
// the arguments it wants as well -- see
// git pull for a more detailed description.
// the arguments it wants as well... get ready!
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
assertOriginSpecified(generalArgs);
var destination;
var source;
var firstArg = generalArgs[1];
if (firstArg) {
if (isColonRefspec(firstArg)) {
var refspecParts = firstArg.split(':');
source = refspecParts[0];
destination = validateBranchName(engine, refspecParts[1]);
} else {
if (firstArg && isColonRefspec(firstArg)) {
var refspecParts = firstArg.split(':');
source = refspecParts[0];
destination = validateBranchName(engine, refspecParts[1]);
} else {
if (firstArg) {
// we are using this arg as destination AND source. the dest branch
// can be created on demand but we at least need this to be a source
// locally otherwise we will fail
source = destination = firstArg;
assertIsRef(engine, firstArg);
sourceObj = engine.refs[firstArg];
} else {
// since they have not specified a source or destination, then
// we source from the branch we are on (or HEAD)
sourceObj = engine.getOneBeforeCommit('HEAD');
}
} else {
// since they have not specified a source or destination, then
// we source from the branch we are on (or HEAD)
var sourceObj = engine.getOneBeforeCommit('HEAD');
source = sourceObj.get('id');
// HOWEVER we push to either the remote tracking branch we have