diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-02-26 09:19:25 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-02-26 13:48:29 +0100 |
| commit | 600a16de54503b8c56bbe299f6ff134f56327d98 (patch) | |
| tree | 33cd2e37a9fe2cb80e854d846912dd04648e6d25 | |
| parent | 2fa0cc88fca5facc632cf347bf17a6914367e225 (diff) | |
add --git-no-ignore-new
| -rw-r--r-- | docs/manpages/git-buildpackage.sgml | 4 | ||||
| -rw-r--r-- | gbp/config.py | 2 | ||||
| -rwxr-xr-x | git-buildpackage | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index b283b4eb..6ef3cc45 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -19,7 +19,7 @@ <refsynopsisdiv> <cmdsynopsis> &git-buildpackage; - <arg><option>--git-ignore-new</option></arg> + <arg><option>--git-[no-]ignore-new</option></arg> <arg><option>--git-tag</option></arg> <arg><option>--git-verbose</option></arg> <arg><option>--git-upstream-branch=</option><replaceable>treeish</replaceable></arg> @@ -83,7 +83,7 @@ <variablelist> <varlistentry> - <term><option>--git-ignore-new</option> + <term><option>--git-[no-]ignore-new</option> </term> <listitem> <para>Build the .diff.gz and debian package although there are diff --git a/gbp/config.py b/gbp/config.py index 3d20beac..31ba36b4 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -73,6 +73,8 @@ class GbpOptionParser(OptionParser): "include the full commit message instead of only the first line, default is '%(full)s'", 'meta': "parse meta tags in commit messages, default is '%(meta)s'", + 'ignore-new': + "build with uncommited changes in the source tree, default is '%(ignore-new)s'", } config_files = [ '/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), diff --git a/git-buildpackage b/git-buildpackage index 640486a5..1f2c4e25 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -161,8 +161,7 @@ def main(argv): parser.add_option_group(cmd_group) parser.add_option_group(export_group) - parser.add_config_file_option(option_name = "ignore-new", dest="ignore_new", - help="build with uncommited changes in the source tree", action="store_true") + parser.add_boolean_config_file_option(option_name = "ignore-new", dest="ignore_new") parser.add_option("--git-verbose", action="store_true", dest="verbose", default=False, help="verbose command execution") tag_group.add_option("--git-tag", action="store_true", dest="tag", default=False, |