diff options
| -rw-r--r-- | gbp/config.py | 9 | ||||
| -rwxr-xr-x | git-dch | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gbp/config.py b/gbp/config.py index 96eeddb8..ba2ed345 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -26,14 +26,15 @@ class GbpOptionParser(OptionParser): 'cleaner' : 'debuild clean', 'debian-branch' : 'master', 'upstream-branch' : 'upstream', - 'sign-tags' : '', # empty means False - 'no-create-orig' : '', # empty means False + 'sign-tags' : '', # empty means False + 'no-create-orig' : '', # empty means False 'keyid' : '', 'posttag' : '', 'debian-tag' : 'debian/%(version)s', 'upstream-tag' : 'upstream/%(version)s', 'filter' : '', - 'snapshot-number' : 'snapshot + 1' + 'snapshot-number' : 'snapshot + 1', + 'git-log' : '--no-merges', } config_files=['/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), @@ -68,4 +69,4 @@ class GbpOptionParser(OptionParser): default=self.config[option_name], help=help % self.config, **kwargs) -# vim:et:ts=4:sw=4: +# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: @@ -198,6 +198,8 @@ def main(argv): help="Format string for debian tags, default is '%(debian-tag)s'") parser.add_config_file_option(option_name="snapshot-number", dest="snapshot_number", help="Expression to determine the next snapshot number, default is '%(snapshot-number)s'") + parser.add_config_file_option(option_name="git-log", dest="git_log", + help="options to pass to git-log") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="verbose command execution") parser.add_option("-s", "--since", dest="since", help="commit to start from") @@ -207,7 +209,6 @@ def main(argv): help="mark as snapshot build") parser.add_option("-a", "--auto", action="store_true", dest="auto", default=False, help="autocomplete changelog from last snapshot or tag") - parser.add_option("--git-log", dest="git_log", help="options to pass to git-log", default="--no-merges") (options, args) = parser.parse_args(argv[1:]) if options.snapshot and options.release: |