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

rebuild for Issue #111

Browse source
This commit is contained in:
Peter Cottle 2013-07-21 18:40:45 -07:00
parent a95a56241b
commit 2be03a7f1c
4 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
build/bundle.js
View file

@ -8272,11 +8272,9 @@ GitEngine.prototype.fakeTeamworkStarter = function() {
} }
this.validateArgBounds(this.generalArgs, 0, 2); this.validateArgBounds(this.generalArgs, 0, 2);
// ugly command line arg parsing // allow formats of: git Faketeamwork 2 or git Faketeamwork side 3
var branch = this.generalArgs[0] || 'master'; var branch = (this.origin.refs[this.generalArgs[0]]) ?
if (!this.origin.refs[branch]) { this.generalArgs[0] : 'master';
branch = 'master';
}
var numToMake = parseInt(this.generalArgs[0], 10) || this.generalArgs[1] || 1; var numToMake = parseInt(this.generalArgs[0], 10) || this.generalArgs[1] || 1;
// make sure its a branch and exists // make sure its a branch and exists
@ -15274,12 +15272,15 @@ HeadlessGit.prototype.sendCommand = function(value, entireCommandPromise) {
var startTime = new Date().getTime(); var startTime = new Date().getTime();
util.splitTextCommand(value, function(commandStr) { util.splitTextCommand(value, function(commandStr) {
var commandObj = new Command({ chain = chain.then(_.bind(function() {
rawStr: commandStr var commandObj = new Command({
}); rawStr: commandStr
var thisDeferred = Q.defer(); });
this.gitEngine.dispatch(commandObj, thisDeferred);
chain = chain.then(thisDeferred.promise); var thisDeferred = Q.defer();
this.gitEngine.dispatch(commandObj, thisDeferred);
return thisDeferred.promise;
}, this));
}, this); }, this);
chain.then(function() { chain.then(function() {
@ -23663,12 +23664,15 @@ HeadlessGit.prototype.sendCommand = function(value, entireCommandPromise) {
var startTime = new Date().getTime(); var startTime = new Date().getTime();
util.splitTextCommand(value, function(commandStr) { util.splitTextCommand(value, function(commandStr) {
var commandObj = new Command({ chain = chain.then(_.bind(function() {
rawStr: commandStr var commandObj = new Command({
}); rawStr: commandStr
var thisDeferred = Q.defer(); });
this.gitEngine.dispatch(commandObj, thisDeferred);
chain = chain.then(thisDeferred.promise); var thisDeferred = Q.defer();
this.gitEngine.dispatch(commandObj, thisDeferred);
return thisDeferred.promise;
}, this));
}, this); }, this);
chain.then(function() { chain.then(function() {
@ -24832,11 +24836,9 @@ GitEngine.prototype.fakeTeamworkStarter = function() {
} }
this.validateArgBounds(this.generalArgs, 0, 2); this.validateArgBounds(this.generalArgs, 0, 2);
// ugly command line arg parsing // allow formats of: git Faketeamwork 2 or git Faketeamwork side 3
var branch = this.generalArgs[0] || 'master'; var branch = (this.origin.refs[this.generalArgs[0]]) ?
if (!this.origin.refs[branch]) { this.generalArgs[0] : 'master';
branch = 'master';
}
var numToMake = parseInt(this.generalArgs[0], 10) || this.generalArgs[1] || 1; var numToMake = parseInt(this.generalArgs[0], 10) || this.generalArgs[1] || 1;
// make sure its a branch and exists // make sure its a branch and exists

1
build/bundle.min.6f4e59f1.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -434,7 +434,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.js"></script> <script src="build/bundle.min.6f4e59f1.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include