mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-25 23:48:34 +02:00
Fixes Issue #4
This commit is contained in:
parent
1ad1ba24d2
commit
81c1d2402a
7 changed files with 24 additions and 6 deletions
|
@ -6569,7 +6569,7 @@ var init = function() {
|
||||||
"help; levels"
|
"help; levels"
|
||||||
].join(''));
|
].join(''));
|
||||||
});
|
});
|
||||||
} else {
|
} else if (!(/\?NODEMO/.test(window.location.href))) {
|
||||||
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
||||||
eventBaton.trigger(
|
eventBaton.trigger(
|
||||||
'commandSubmitted',
|
'commandSubmitted',
|
||||||
|
@ -8726,6 +8726,12 @@ GitEngine.prototype.merge = function(targetSource, currentLocation) {
|
||||||
GitEngine.prototype.checkoutStarter = function() {
|
GitEngine.prototype.checkoutStarter = function() {
|
||||||
var args = null;
|
var args = null;
|
||||||
if (this.commandOptions['-b']) {
|
if (this.commandOptions['-b']) {
|
||||||
|
if (this.generalArgs.length) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "I don't expect general args before -b!"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// the user is really trying to just make a branch and then switch to it. so first:
|
// the user is really trying to just make a branch and then switch to it. so first:
|
||||||
args = this.commandOptions['-b'];
|
args = this.commandOptions['-b'];
|
||||||
this.twoArgsImpliedHead(args, '-b');
|
this.twoArgsImpliedHead(args, '-b');
|
||||||
|
@ -18626,7 +18632,7 @@ var init = function() {
|
||||||
"help; levels"
|
"help; levels"
|
||||||
].join(''));
|
].join(''));
|
||||||
});
|
});
|
||||||
} else {
|
} else if (!(/\?NODEMO/.test(window.location.href))) {
|
||||||
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
||||||
eventBaton.trigger(
|
eventBaton.trigger(
|
||||||
'commandSubmitted',
|
'commandSubmitted',
|
||||||
|
@ -20364,6 +20370,12 @@ GitEngine.prototype.merge = function(targetSource, currentLocation) {
|
||||||
GitEngine.prototype.checkoutStarter = function() {
|
GitEngine.prototype.checkoutStarter = function() {
|
||||||
var args = null;
|
var args = null;
|
||||||
if (this.commandOptions['-b']) {
|
if (this.commandOptions['-b']) {
|
||||||
|
if (this.generalArgs.length) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "I don't expect general args before -b!"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// the user is really trying to just make a branch and then switch to it. so first:
|
// the user is really trying to just make a branch and then switch to it. so first:
|
||||||
args = this.commandOptions['-b'];
|
args = this.commandOptions['-b'];
|
||||||
this.twoArgsImpliedHead(args, '-b');
|
this.twoArgsImpliedHead(args, '-b');
|
||||||
|
|
File diff suppressed because one or more lines are too long
1
build/bundle.min.797f6847.js
Normal file
1
build/bundle.min.797f6847.js
Normal file
File diff suppressed because one or more lines are too long
2
build/bundle.min.js
vendored
2
build/bundle.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -409,7 +409,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.min.3b93aec2.js"></script>
|
<script src="build/bundle.min.797f6847.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
|
||||||
|
|
|
@ -131,7 +131,7 @@ var init = function() {
|
||||||
"help; levels"
|
"help; levels"
|
||||||
].join(''));
|
].join(''));
|
||||||
});
|
});
|
||||||
} else {
|
} else if (!(/\?NODEMO/.test(window.location.href))) {
|
||||||
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
sandbox.mainVis.customEvents.on('gitEngineReady', function() {
|
||||||
eventBaton.trigger(
|
eventBaton.trigger(
|
||||||
'commandSubmitted',
|
'commandSubmitted',
|
||||||
|
|
|
@ -1208,6 +1208,12 @@ GitEngine.prototype.merge = function(targetSource, currentLocation) {
|
||||||
GitEngine.prototype.checkoutStarter = function() {
|
GitEngine.prototype.checkoutStarter = function() {
|
||||||
var args = null;
|
var args = null;
|
||||||
if (this.commandOptions['-b']) {
|
if (this.commandOptions['-b']) {
|
||||||
|
if (this.generalArgs.length) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "I don't expect general args before -b!"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// the user is really trying to just make a branch and then switch to it. so first:
|
// the user is really trying to just make a branch and then switch to it. so first:
|
||||||
args = this.commandOptions['-b'];
|
args = this.commandOptions['-b'];
|
||||||
this.twoArgsImpliedHead(args, '-b');
|
this.twoArgsImpliedHead(args, '-b');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue