add --no-pristine-tar

Closes: #517024

diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 8ee48b0701e182b6f581b5341f666223be97b1b5..b283b4eb93d30880df1194038a0047004dfb9007 100644 (file)
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -34,7 +34,7 @@
       <arg><option>--git-tarball-dir=</option><replaceable>directory</replaceable></arg>
       <arg><option>--git-export-dir=</option><replaceable>directory</replaceable></arg>
       <arg><option>--git-export=</option><replaceable>treeish</replaceable></arg>
-      <arg><option>--git-pristine-tar</option></arg>
+      <arg><option>--git-[no-]pristine-tar</option></arg>
       <arg><option>--git-dont-purge</option></arg>
       <arg><option>--git-tag-only</option></arg>
     </cmdsynopsis>
@@ -202,7 +202,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--git-pristine-tar</option>
+        <term><option>--git-[no-]pristine-tar</option>
         </term>
         <listitem>
          <para>use pristine-tar to create the orig.tar.gz</para>

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index fb5d38064722c57d42bc5333c9e3751322810efa..a3426b0bd5d581795cec13d28ae6a4c0a6c8a0dd 100644 (file)
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -30,7 +30,7 @@
       <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
       <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
       <arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
-      <arg><option>--pristine-tar</option></arg>
+      <arg><option>--[no-]pristine-tar</option></arg>
       <arg choice="plain"><replaceable>debian-source.dsc</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>

diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 9d23ab52312811ac516fcf1ccaf735deebcfd4e3..2c0d44da6305e3fcb52f9736910d6e08c52fb242 100644 (file)
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -31,7 +31,7 @@
       <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
       <arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
-      <arg><option>--pristine-tar</option></arg>
+      <arg><option>--[no-]pristine-tar</option></arg>
       <arg choice="plain"><replaceable>upstream-source</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>

diff --git a/git-buildpackage b/git-buildpackage
index bda9d161de573bb0ae455b92bca05507da0e8018..640486a5498edaf127d4bb022fd975fb89c7b68f 100755 (executable)
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -173,7 +173,7 @@ def main(argv):
     tag_group.add_config_file_option(option_name="keyid", dest="keyid")
     tag_group.add_config_file_option(option_name="debian-tag", dest="debian_tag")
     tag_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
-    orig_group.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", action="store_true")
+    orig_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     orig_group.add_config_file_option(option_name="no-create-orig", dest="no_create_orig",
                       help="don't create orig.tar.gz", action="store_true")
     orig_group.add_config_file_option(option_name="tarball-dir", dest="tarball_dir",

diff --git a/git-import-dsc b/git-import-dsc
index f9c50cfbfe5b8beed4d9bbc5b8e38b76755a6757..a74f7b32b0cc511f85236691c7c6685479a63f93 100755 (executable)
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -105,7 +105,7 @@ def main(argv):
     parser.add_config_file_option(option_name="debian-tag", dest="debian_tag")
     parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
     parser.add_config_file_option(option_name="filter", dest="filters", action="append")
-    parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", action="store_true")
+    parser.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     (options, args) = parser.parse_args(argv[1:])
 
     if options.verbose:

diff --git a/git-import-orig b/git-import-orig
index e7a344f61f1025dd82e7e43b036f7b80358aca64..67090e93e01be62a2df2bc2ab0e20b3544fbba5f 100755 (executable)
--- a/git-import-orig
+++ b/git-import-orig
@@ -119,7 +119,7 @@ def main(argv):
     parser.add_config_file_option(option_name="keyid", dest="keyid")
     parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
     parser.add_config_file_option(option_name="filter", dest="filters", action="append")
-    parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", action="store_true")
+    parser.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     (options, args) = parser.parse_args(argv[1:])
 
     if options.verbose: