~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The gitmergeonefile config section is deprecated
[stgit]
/
stgit
/
gitmergeonefile.py
diff --git
a/stgit/gitmergeonefile.py
b/stgit/gitmergeonefile.py
index
586cef9
..
3b3175b
100644
(file)
--- a/
stgit/gitmergeonefile.py
+++ b/
stgit/gitmergeonefile.py
@@
-31,15
+31,11
@@
class GitMergeException(Exception):
# Options
#
try:
# Options
#
try:
- merger = config.get('gitmergeonefile', 'merger')
+ merger = config.get('stgit', 'merger')
+ keeporig = config.get('stgit', 'keeporig')
except Exception, err:
raise GitMergeException, 'Configuration error: %s' % err
except Exception, err:
raise GitMergeException, 'Configuration error: %s' % err
-if config.has_option('gitmergeonefile', 'keeporig'):
- keeporig = config.get('gitmergeonefile', 'keeporig')
-else:
- keeporig = 'yes'
-
#
# Utility functions
#
# Utility functions