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

Resolves #385 -- validate no amend options

Browse source
This commit is contained in:
Peter Cottle 2016-07-31 16:06:05 -07:00
parent 422e61c93c
commit 02a69e85c0
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,8 +153,13 @@ var commandConfig = {
msg = args[0]; msg = args[0];
} }
if (commandOptions['--amend']) {
args = commandOptions['--amend'];
command.validateArgBounds(args, 0, 0, '--amend');
}
var newCommit = engine.commit({ var newCommit = engine.commit({
isAmend: commandOptions['--amend'] isAmend: !!commandOptions['--amend']
}); });
if (msg) { if (msg) {
msg = msg msg = msg
@ -267,7 +272,7 @@ var commandConfig = {
engine.pull({ engine.pull({
source: source, source: source,
destination: destination, destination: destination,
isRebase: commandOptions['--rebase'] isRebase: !!commandOptions['--rebase']
}); });
} }
}, },