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

branch deleting now works

Browse source
This commit is contained in:
Peter Cottle 2012-08-20 12:10:18 -07:00
parent eeeae586f8
commit 34f547b56a
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/git.js
View file

@ -235,18 +235,17 @@ GitEngine.prototype._deleteBranch = function(name) {
// trying to delete, lets check our refs // trying to delete, lets check our refs
var target = this._resolveId(name); var target = this._resolveId(name);
if (target.get('type') !== 'branch') { if (target.get('type') !== 'branch') {
throw new Error("You can't delete things that arent branches with -d"); throw new Error("You can't delete things that arent branches with branch command");
} }
if (target.get('id') == 'master') { if (target.get('id') == 'master') {
throw new Error("You can't delete the master branch!"); throw new Error("You can't delete the master branch!");
} }
if (this.HEAD.get('target') === target) { if (this.HEAD.get('target') === target) {
// we need to change HEAD to a commit then throw new Error("Cannot delete the branch you are currently on");
} }
this.refs[id].delete(); var id = target.get('id');
target.delete();
delete this.refs[id]; delete this.refs[id];
}; };