cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:fix/git-describe-specific-abbrev-devel into cloud-init:ubuntu/devel.

Commit message:
debian/new-upstream-snapshot: use --abbrev=8 for git-describe.

The tools that use "git describe" were just assuming a consisent
number of characters in the hash. It seems ubuntu 16.04 would use 7
and later versions use 8. To avoid that discrepency in developer
environments, set it to 8.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/331884
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/git-describe-specific-abbrev-devel into cloud-init:ubuntu/devel.

diff --git a/debian/new-upstream-snapshot b/debian/new-upstream-snapshot
index 4e7aaa0..6ad8af6 100755
--- a/debian/new-upstream-snapshot
+++ b/debian/new-upstream-snapshot
@@ -85,9 +85,8 @@ pkg_name=$(dpkg-parsechangelog --show-field Source) ||
 t=${prev_pkg_ver%-*}
 prev_pkg_hash=${t##*-g}
 
-new_pkg_upstream=$(git describe master)
 new_pkg_debian="0ubuntu1"
-new_upstream_ver=$(git describe "${from_ref}")
+new_upstream_ver=$(git describe --abbrev=8 "${from_ref}")
 new_pkg_ver="${new_upstream_ver}-${new_pkg_debian}"
 
 prev_upstream_ver=${prev_pkg_ver%-*}