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

[Origin] few updates

Browse source
This commit is contained in:
Peter Cottle 2013-05-27 11:04:47 -07:00
parent 29415cb525
commit aba8265a00
7 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ var regexMap = {
'git show': /^git +show($|\s)/,
'git status': /^git +status($|\s)/,
'git cherry-pick': /^git +cherry-pick($|\s)/,
'git fakeTeamwork': /^git +fakeTeamwork *?$/,
'git fakeTeamwork': /^git +fakeTeamwork($|\s)/,
'git fetch': /^git +fetch *?$/,
'git pull': /^git +pull($|\s)/,
'git clone': /^git +clone *?$/

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

@ -800,7 +800,13 @@ GitEngine.prototype.fetch = function() {
};
GitEngine.prototype.pullStarter = function() {
if (!this.hasOrigin()) {
throw new GitError({
msg: intl.str('git-error-origin-required')
});
}
this.acceptNoGeneralArgs();
// no matter what fetch
this.fetch();
// then either rebase or merge
@ -817,15 +823,18 @@ GitEngine.prototype.cloneStarter = function() {
};
GitEngine.prototype.fakeTeamworkStarter = function() {
this.acceptNoGeneralArgs();
if (!this.hasOrigin()) {
throw new GitError({
msg: intl.str('git-error-origin-required')
});
}
var id = this.getUniqueID();
this.origin.receiveTeamwork(id, this.animationQueue);
var numToMake = this.generalArgs[0] || 1;
this.validateArgBounds(this.generalArgs, 0, 1);
for (var i = 0; i < numToMake; i++) {
var id = this.getUniqueID();
this.origin.receiveTeamwork(id, this.animationQueue);
}
};
GitEngine.prototype.receiveTeamwork = function(id, animationQueue) {