export: change VCS tag in spec to sha1 of commitish

Do not resolve to the sha1 of the commit object anymore. That is, the
VCS tag will contain the sha1 of the tag object if an (annotated) tag is
exported (previously, it would contain the sha1 of the commit the tag,
or the chain of tags, pointed to) (previously, it would contain the sha1
of the commit the tag, or the chain of tags, pointed to).

Change-Id: I5b8d164cf1f4e910740d75df825cd506ffb9437c
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index e5ad9136a5fa10abdaa9efddb64de53f4aa0b3f8..dca52c5ccd44ffff36905d9c687b5b10f96f5a84 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -140,7 +140,7 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args,
             "--git-pq-branch=development/%(branch)s/%(upstreamversion)s",
             "--git-upstream-branch=%s" % upstream_branch,
             "--git-upstream-tag=%s" % upstream_tag,
-            "--git-spec-vcs-tag=%s#%%(commit)s" % reponame]
+            "--git-spec-vcs-tag=%s#%%(commitish)s" % reponame]
 
     if create_tarball:
         argv.append("--git-force-create")