Control: retitle -1 import-orig: document pattern replacing in upstream-vcs-tag
Control: severity -1 minor
Control: tags -1 patch
On 5 June 2015 at 10:40, Felipe Sateler <[email protected]> wrote:
> Package: git-buildpackage
> Version: 0.6.31
> Severity: wishlist
>
> When importing a new upstream tarball, I frequently forget to pass
> --upstream-vcs-tag=vX.Y.Z .
>
> It would be ideal if import-orig had an option upstream-vcs-tag-pattern
> akin to upstream-tag, or add pattern support to upstream-vcs-tag.
>
> The point would be to be able to set this in debian/gbp.conf:
>
> [import-orig]
> upstream-vcs-tag = v%(version)s
>
> So that running gbp import-orig would:
>
> 0. Substitute the current version into the tag pattern
> 1a. If a tag vX.Y.Z is found, merge it
> 1b. If the tag vX.Y.Z is not found, abort with an error.
>
> What do you think?
Ehm, digging into the code to attempt a patch makes me see this is
already supported. The only bug then is that this is not documented
Attached a minimal doc patch
--
Saludos,
Felipe Sateler
diff --git a/docs/manpages/gbp-import-orig.sgml
b/docs/manpages/gbp-import-orig.sgml
index 53c3377..809c46a 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -25,7 +25,7 @@
<arg><option>--[no-]merge</option></arg>
<arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
-
<arg><option>--upstream-vcs-tag=</option><replaceable>tag_name</replaceable></arg>
+
<arg><option>--upstream-vcs-tag=</option><replaceable>tag-format</replaceable></arg>
<arg><option>--[no-]sign-tags</option></arg>
<arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
@@ -106,13 +106,15 @@
</listitem>
</varlistentry>
<varlistentry>
-
<term><option>--upstream-vcs-tag</option>=<replaceable>tag_name</replaceable>
+
<term><option>--upstream-vcs-tag</option>=<replaceable>tag-format</replaceable>
</term>
<listitem>
<para>
- Add <replaceable>tag_name</replaceable> as additional parent to the
+ Add <replaceable>tag-format</replaceable> as additional parent to the
commit of the upstream tarball. Useful when upstream uses git and you
- want to link to it's revision history.
+ want to link to it's revision history. The
+ <replaceable>tag-format</replaceable> can be a pattern similar to
+ what <option>--upstream-tag</option> supports.
</para>
</listitem>
</varlistentry>
