summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-04-18 10:49:38 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-04-18 11:50:05 +0300
commit4b59a14f914e8ecea79f857e37389b2c1578d99b (patch)
treef5797458afd2a3f2dc362cbc0caa844e6416b1ec
parentd1cdbd22778c040a5b6620d463092c735262d2e7 (diff)
downloadgit-buildpackage-4b59a14f914e8ecea79f857e37389b2c1578d99b.tar.gz
git-buildpackage-4b59a14f914e8ecea79f857e37389b2c1578d99b.tar.bz2
git-buildpackage-4b59a14f914e8ecea79f857e37389b2c1578d99b.zip
buildpackage-rpm: full sha1 in the tagname for VCS tag
Use full-length sha1 in the 'tagname' that is used in the VCS tag in the spec file (cmdline option --git-spec-vcs-tag). Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xgbp/scripts/buildpackage_rpm.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 831d85f2..f6a15197 100755
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -603,7 +603,8 @@ def main(argv):
'GBP_SHA1': sha})()
else:
try:
- tree_name = repo.describe(tree, longfmt=True, always=True)
+ tree_name = repo.describe(tree, longfmt=True, always=True,
+ abbrev=40)
except GitRepositoryError:
# If tree is not commit-ish, expect it to be from current HEAD
tree_name = repo.describe('HEAD', longfmt=True, always=True) +\