add --no-sign-tags to git-import-{dsc,orig}

Closes: #508889

diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index caf8ff7..d4e8936 100644 (file)
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -26,7 +26,7 @@
       <arg><option>--git-debian-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--git-builder=</option><replaceable>BUILD_CMD</replaceable></arg>
       <arg><option>--git-cleaner=</option><replaceable>CLEAN_CMD</replaceable></arg>
-      <arg><option>--git-sign-tags</option></arg>
+      <arg><option>--git-[no-]sign-tags</option></arg>
       <arg><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--git-posttag=</option><replaceable>command</replaceable></arg>
       <arg><option>--git-debian-tag=</option><replaceable>tag-format</replaceable></arg>
@@ -139,7 +139,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--git-sign-tags</option>
+        <term><option>--git-[no-]sign-tags</option>
         </term>
         <listitem>
          <para>GPG sign all created tags</para>

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index e9a6740..fb5d380 100644 (file)
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -25,7 +25,7 @@
       <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--no-merge</option></arg>
-      <arg><option>--sign-tags</option></arg>
+      <arg><option>--[no-]sign-tags</option></arg>
       <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
       <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
@@ -77,7 +77,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--sign-tags</option>
+        <term><option>--[no-]sign-tags</option>
         </term>
         <listitem>
           <para>GPG sign all created tags</para>

diff --git a/git-import-dsc b/git-import-dsc
index 16ae033..4cafd21 100755 (executable)
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -101,6 +101,7 @@ def main(argv):
     parser.add_option("--no-merge", dest='merge', action="store_false", default=True,
                       help="after import dont do any merging to another branch")
     parser.add_config_file_option(option_name="sign-tags", dest="sign_tags", action="store_true")
+    parser.add_config_file_option(option_name="no-sign-tags", dest="sign_tags", action="store_false")
     parser.add_config_file_option(option_name="keyid", dest="keyid")
     parser.add_config_file_option(option_name="debian-tag", dest="debian_tag")
     parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")

diff --git a/git-import-orig b/git-import-orig
index 05cfcc1..88d544a 100755 (executable)
--- a/git-import-orig
+++ b/git-import-orig
@@ -116,6 +116,7 @@ def main(argv):
     parser.add_config_file_option(option_name="no-dch", dest='no_dch',
                       help="don't call dch after the import", action="store_true")
     parser.add_config_file_option(option_name="sign-tags", dest="sign_tags", action="store_true")
+    parser.add_config_file_option(option_name="no-sign-tags", dest="sign_tags", action="store_false")
     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")