add --git-no-ignore-new
authorGuido Günther <agx@sigxcpu.org>
Thu, 26 Feb 2009 08:19:25 +0000 (09:19 +0100)
committerGuido Günther <agx@sigxcpu.org>
Thu, 26 Feb 2009 12:48:29 +0000 (13:48 +0100)
docs/manpages/git-buildpackage.sgml
gbp/config.py
git-buildpackage

index b283b4e..6ef3cc4 100644 (file)
@@ -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
index 3d20bea..31ba36b 100644 (file)
@@ -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'),
index 640486a..1f2c4e2 100755 (executable)
@@ -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,