chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e078133
)
Correctly raise exception on unknown pull-policy.
author
Yann Dirson
<ydirson@altern.org>
Tue, 27 Feb 2007 22:39:09 +0000
(22:39 +0000)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Tue, 27 Feb 2007 22:39:09 +0000
(22:39 +0000)
Signed-off-by: Yann Dirson <ydirson@altern.org>
stgit/commands/pull.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index e4a2b6237670a26d35b93ecbbfb7f3ebab140086..7b3c90ca93e8b987e27a2fe96ab5b81ad9de3bfb 100644
(file)
--- a/
stgit/commands/pull.py
+++ b/
stgit/commands/pull.py
@@
-20,6
+20,7
@@
from optparse import OptionParser, make_option
from stgit.commands.common import *
from stgit.utils import *
+from stgit.config import GitConfigException
from stgit import stack, git
@@
-73,7
+74,7
@@
def func(parser, options, args):
elif policy == 'rebase':
must_rebase = 1
else:
- raise
config.
ConfigException, 'Unsupported pull-policy "%s"' % policy
+ raise
Git
ConfigException, 'Unsupported pull-policy "%s"' % policy
applied = prepare_rebase(real_rebase=must_rebase, force=options.force)