Add the ability to delete a branch to git.py

"git branch -D" checks first to see whether all the commits in the doomed
branch are already in the branch pointed to by HEAD.  I don't think we need
that level of checking here.  We just delete "refs/heads/branchname."

Signed-off-by: Chuck Lever <cel@netapp.com>

diff --git a/stgit/git.py b/stgit/git.py
index cc3b55becccb4502e47c1b3a49e66080476a17b9..7bb41c56d58be9c6d492ab33bbf89643d942ba46 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -307,6 +307,14 @@ def switch_branch(name):
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
 
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
 

+def delete_branch(name):
+    """Delete a git branch
+    """
+    branch_head = os.path.join('refs', 'heads', name)
+    if not branch_exists(branch_head):
+        raise GitException, 'Branch "%s" does not exist' % name
+    os.remove(os.path.join(base_dir, branch_head))
+

 def add(names):
     """Add the files or recursively add the directory contents
     """
 def add(names):
     """Add the files or recursively add the directory contents
     """