Merge remote-tracking branch 'origin/sam/morph-version-no-tags'

Several reviews; all were happy with the code but not all were sure that
this is the correct approach to take. I have merged, because we need this
change to make Baserock releases easier. We can revisit it in the future
if we want to provide semantic versioning for Morph, instead of our
current "report the version of the containing OS image instead"
approach.

1 files changed, 3 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 59b95b64..765cf045 100644
--- a/setup.py
+++ b/setup.py
@@ -84,8 +84,9 @@ class GenerateResources(build):
                     raise subprocess.CalledProcessError(p.returncode, command)
                 f.write(o[0].strip())
 
-        save_git_info('version', 'describe', '--always',
-                      '--dirty=-unreproducible')
+        save_git_info('version', 'describe', '--abbrev=40', '--always',
+                      '--dirty=-unreproducible',
+                      '--match=DO-NOT-MATCH-ANY-TAGS')
         save_git_info('commit', 'rev-parse', 'HEAD^{commit}')
         save_git_info('tree', 'rev-parse', 'HEAD^{tree}')
         save_git_info('ref', 'rev-parse', '--symbolic-full-name', 'HEAD')