diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-01-01 19:22:07 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2009-01-01 19:25:15 +0100 |
| commit | 7c2034ccfd84d30edfd4f533c3d025134a8b7529 (patch) | |
| tree | 090362bcbf1e5e128a84d8c12af583041105cd64 | |
| parent | 6fe5985e838808daf4059d05e219fc0ac9c50a9f (diff) | |
add --no-sign-tags to git-import-{dsc,orig}
Closes: #508889
| -rw-r--r-- | docs/manpages/git-buildpackage.sgml | 4 | ||||
| -rw-r--r-- | docs/manpages/git-import-dsc.sgml | 4 | ||||
| -rwxr-xr-x | git-import-dsc | 1 | ||||
| -rwxr-xr-x | git-import-orig | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index caf8ff76..d4e8936a 100644 --- 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 e9a6740e..fb5d3806 100644 --- 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 16ae0338..4cafd216 100755 --- 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 05cfcc1f..88d544ac 100755 --- 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") |