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

Support for push refspecs with colon, aka master:master or :foo

Browse source
This commit is contained in:
Peter Cottle 2013-10-09 22:29:05 -07:00
parent 748eddbd86
commit f930bae005
8 changed files with 203 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,10 @@ var crappyUnescape = function(str) {
return str.replace(/'/g, "'").replace(///g, "/");
};
function isColonRefspec(str) {
return str.indexOf(':') !== -1 && str.split(':').length === 2;
}
var assertOriginSpecified = function(generalArgs) {
if (generalArgs[0] !== 'origin') {
throw new GitError({
@ -283,7 +287,7 @@ var commandConfig = {
command.validateArgBounds(names, 1, Number.MAX_VALUE, '-d');
_.each(names, function(name) {
engine.deleteBranch(name);
engine.validateAndDeleteBranch(name);
});
return;
}
@ -557,15 +561,24 @@ var commandConfig = {
assertOriginSpecified(generalArgs);
var tracking;
if (generalArgs[1]) {
tracking = assertBranchIsRemoteTracking(engine, generalArgs[1]);
var source;
var firstArg = generalArgs[1];
if (firstArg) {
if (isColonRefspec(firstArg)) {
var refspecParts = firstArg.split(':');
source = refspecParts[0];
tracking = assertBranchIsRemoteTracking(engine, refspecParts[1]);
} else {
tracking = assertBranchIsRemoteTracking(engine, firstArg);
}
} else {
var oneBefore = engine.getOneBeforeCommit('HEAD');
tracking = assertBranchIsRemoteTracking(engine, oneBefore.get('id'));
}
engine.push({
destination: tracking
destination: tracking,
source: source
});
}
}