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

git commit --amend -C nice

Browse source
This commit is contained in:
Peter Cottle 2012-11-04 23:30:10 -08:00
parent 925497377e
commit 89b7e97e1d
3 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/git.js
View file

@ -281,8 +281,19 @@ GitEngine.prototype.getBranches = function() {
return toReturn;
};
GitEngine.prototype.printBranches = function() {
var branches = this.getBranches();
GitEngine.prototype.printBranchesWithout = function(without) {
var commitToBranches = this.getUpstreamBranchSet();
var commitID = this.getCommitFromRef(without).get('id');
var toPrint = [];
_.each(commitToBranches[commitID], function(branchJSON) {
branchJSON.selected = this.HEAD.get('target').get('id') == branchJSON.id;
toPrint.push(branchJSON);
}, this);
this.printBranches(toPrint);
};
GitEngine.prototype.printBranches = function(branches) {
var result = '';
_.each(branches, function(branch) {
result += (branch.selected ? '* ' : '') + branch.id + '\n';
@ -292,13 +303,6 @@ GitEngine.prototype.printBranches = function() {
});
};
GitEngine.prototype.logBranches = function() {
var branches = this.getBranches();
_.each(branches, function(branch) {
console.log((branch.selected ? '* ' : '') + branch.id);
});
};
GitEngine.prototype.makeCommit = function(parents, id, options) {
// ok we need to actually manually create commit IDs now because
// people like nikita (thanks for finding this!) could
@ -527,10 +531,23 @@ GitEngine.prototype.commitStarter = function() {
GitEngine.prototype.commit = function() {
var targetCommit = this.getCommitFromRef(this.HEAD);
var id = undefined;
// if we want to ammend, go one above
if (this.commandOptions['--amend']) {
targetCommit = this.resolveID('HEAD~1');
// if they specify -C, go there
if (this.commandOptions['-C']) {
this.validateArgBounds(this.commandOptions['-C'], 1, 1, '-C');
targetCommit = this.numBackFrom(this.getCommitFromRef(this.commandOptions['-C'][0]), 1);
}
id = this.rebaseAltID(this.getCommitFromRef('HEAD').get('id'));
} else {
if (this.commandOptions['-C']) {
throw new GitError({
msg: 'I only support -C when doing --amend, sorry'
});
}
}
var newCommit = this.makeCommit([targetCommit], id);
@ -1188,6 +1205,13 @@ GitEngine.prototype.branchStarter = function() {
return;
}
if (this.commandOptions['--contains']) {
var args = this.commandOptions['--contains'];
this.validateArgBounds(args, 1, 1, '--contains');
this.printBranchesWithout(args[0]);
return;
}
if (this.commandOptions['-f']) {
var args = this.commandOptions['-f'];
this.twoArgsImpliedHead(args, '-f');
@ -1199,7 +1223,7 @@ GitEngine.prototype.branchStarter = function() {
if (this.generalArgs.length == 0) {
this.printBranches();
this.printBranches(this.getBranches());
return;
}