~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the checking for the default configuration values
[stgit]
/
stgit
/
commands
/
refresh.py
diff --git
a/stgit/commands/refresh.py
b/stgit/commands/refresh.py
index
20b7546
..
c5f390f
100644
(file)
--- a/
stgit/commands/refresh.py
+++ b/
stgit/commands/refresh.py
@@
-66,10
+66,7
@@
options = [make_option('-f', '--force',
def func(parser, options, args):
def func(parser, options, args):
- if config.has_option('stgit', 'autoresolved'):
- autoresolved = config.get('stgit', 'autoresolved')
- else:
- autoresolved = 'no'
+ autoresolved = config.get('stgit', 'autoresolved')
if autoresolved != 'yes':
check_conflicts()
if autoresolved != 'yes':
check_conflicts()