~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a couple of safety checks to series creation
[stgit]
/
stgit
/
commands
/
branch.py
diff --git
a/stgit/commands/branch.py
b/stgit/commands/branch.py
index
c4b5945
..
be501a8
100644
(file)
--- a/
stgit/commands/branch.py
+++ b/
stgit/commands/branch.py
@@
-126,8
+126,11
@@
def func(parser, options, args):
if len(args) == 2:
tree_id = git_id(args[1])
if len(args) == 2:
tree_id = git_id(args[1])
- git.create_branch(args[0], tree_id)
+ if git.branch_exists(args[0]):
+ raise CmdException, 'Branch "%s" already exists' % args[0]
+
stack.Series(args[0]).init()
stack.Series(args[0]).init()
+ git.create_branch(args[0], tree_id)
print 'Branch "%s" created.' % args[0]
return
print 'Branch "%s" created.' % args[0]
return