mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-28 00:40:07 +02:00
legittt resetting works now too
This commit is contained in:
parent
acd04d6d00
commit
a93a16f06f
2 changed files with 31 additions and 1 deletions
|
@ -143,7 +143,7 @@ OptionParser.prototype.getMasterOptionMap = function() {
|
||||||
return {
|
return {
|
||||||
commit: {
|
commit: {
|
||||||
'--amend': false,
|
'--amend': false,
|
||||||
'-a': false,
|
'-a': false, // warning
|
||||||
'-am': false
|
'-am': false
|
||||||
},
|
},
|
||||||
add: {},
|
add: {},
|
||||||
|
@ -156,6 +156,7 @@ OptionParser.prototype.getMasterOptionMap = function() {
|
||||||
},
|
},
|
||||||
reset: {
|
reset: {
|
||||||
'--hard': false,
|
'--hard': false,
|
||||||
|
'--soft': false, // this will raise and error but we catch it in gitEngine
|
||||||
},
|
},
|
||||||
merge: {},
|
merge: {},
|
||||||
rebase: {},
|
rebase: {},
|
||||||
|
|
29
src/git.js
29
src/git.js
|
@ -135,7 +135,36 @@ GitEngine.prototype.acceptNoGeneralArgs = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
GitEngine.prototype.resetStarter = function() {
|
GitEngine.prototype.resetStarter = function() {
|
||||||
|
if (this.commandOptions['--soft']) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "You can't use --soft because there is no concept of stashing" +
|
||||||
|
" changes or staging files, so you will lose your progress." +
|
||||||
|
" Try using interactive rebasing (or just rebasing) to move commits."
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (this.commandOptions['--hard']) {
|
||||||
|
events.trigger('commandProcessWarn',
|
||||||
|
'Nice! You are using --hard. The default behavior is a hard reset in ' +
|
||||||
|
"this demo, so don't worry about specifying the option explicity"
|
||||||
|
);
|
||||||
|
// dont absorb the arg off of --hard
|
||||||
|
this.generalArgs = this.generalArgs.concat(this.commandOptions['--hard']);
|
||||||
|
}
|
||||||
|
if (this.generalArgs.length !== 1) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "Specify the commit to reset to (1 argument)"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (this.getDetachedHead()) {
|
||||||
|
throw new GitError({
|
||||||
|
msg: "Cant reset in detached head! Use checkout if you want to move"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.reset(this.generalArgs[0]);
|
||||||
|
};
|
||||||
|
|
||||||
|
GitEngine.prototype.reset = function(target) {
|
||||||
|
this.setLocationTarget('HEAD', this.getCommitFromRef(target));
|
||||||
};
|
};
|
||||||
|
|
||||||
GitEngine.prototype.commitStarter = function() {
|
GitEngine.prototype.commitStarter = function() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue