Add --multimaint support to git-dch

diff --git a/gbp/config.py b/gbp/config.py
index ff75a19..b3f4c53 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -73,7 +73,8 @@ class GbpOptionParser(OptionParser):
                  'compression'     : 'auto',
                  'compression-level': '9',
                  'remote-url-pattern' : 'ssh://alioth.debian.org/git/collab-maint/%(pkg)s.git',
-                 'multimaint-merge' : 'False',
+                 'multimaint'      : 'True',
+                 'multimaint-merge': 'False',
                  'pbuilder'        : 'False',
                  'dist'            : 'sid',
                  'arch'            : '',
@@ -116,6 +117,8 @@ class GbpOptionParser(OptionParser):
                   "extract orig tarball when using export-dir option, default is '%(overlay)s'",
              'remote-url-pattern':
                   "Remote url pattern to create the repo at, default is '%(remote-url-pattern)s'",
+             'multimaint':
+                  "Note multiple maintainers, default is '%(multimaint)s'",
              'multimaint-merge':
                   "Merge commits by maintainer, default is '%(multimaint-merge)s'",
              'pbuilder':

diff --git a/git-dch b/git-dch
index 4ec8a41..8eb796b 100755 (executable)
--- a/git-dch
+++ b/git-dch
@@ -325,6 +325,7 @@ def main(argv):
                       type="int", metavar="N")
     commit_group.add_config_file_option(option_name="ignore-regex", dest="ignore_regex",
                       help="Ignore commit lines matching regex, default is '%(ignore-regex)s'")
+    commit_group.add_boolean_config_file_option(option_name="multimaint", dest="multimaint")
     commit_group.add_boolean_config_file_option(option_name="multimaint-merge", dest="multimaint_merge")
 
     help_msg = 'Load Python code from CUSTOMIZATION_FILE.  At the moment,' \
@@ -348,6 +349,11 @@ def main(argv):
     else:
         dch_options = "--nomultimaint-merge"
 
+    if options.multimaint:
+        dch_options += " --multimaint"
+    else:
+        dch_options += " --nomultimaint"
+
     if options.customization_file:
         execfile(options.customization_file,
                  user_customizations,