~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Release 0.8
[stgit]
/
stgit
/
commands
/
pull.py
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index
f4e0005
..
69b8d88
100644
(file)
--- a/
stgit/commands/pull.py
+++ b/
stgit/commands/pull.py
@@
-54,6
+54,9
@@
def func(parser, options, args):
if len(args) == 2:
refspec = args[1]
+ if crt_series.get_protected():
+ raise CmdException, 'This branch is protected. Pulls are not permitted'
+
check_local_changes()
check_conflicts()
check_head_top_equal()