diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-30 16:06:22 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-30 16:06:22 +0100 |
| commit | b15babc4a166e476d5bcd3946e8db8e2d4583969 (patch) | |
| tree | eea8084259b68e0e30027f44e40f5d3e866d081b | |
| parent | c754d0366d4557910775bfa83c85ffdf98af0610 (diff) | |
| parent | faddf7dcecd77f52463eb1f827544e2e32468639 (diff) | |
| download | morph-b15babc4a166e476d5bcd3946e8db8e2d4583969.tar.gz | |
Merge branch 'baserock/pedroalvarez/morph-version-fix'
Reviewed-by: Adam Coldrick
Reviewed-by: Sam Thursfield
Reviewed-by: Richard Maw
| -rw-r--r-- | morphlib/gitversion.py | 6 | ||||
| -rwxr-xr-x | tests.as-root/metadata-includes-morph-version.script | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/morphlib/gitversion.py b/morphlib/gitversion.py index b1f82da6..c593c330 100644 --- a/morphlib/gitversion.py +++ b/morphlib/gitversion.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013 - 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,7 +49,9 @@ except IOError, e: return o[0].strip() try: - version = run_git('describe', '--always', '--dirty=-unreproducible') + version = run_git('describe', '--abbrev=40', '--always', + '--dirty=-unreproducible', + '--match=DO-NOT-MATCH-ANY-TAGS') commit = run_git('rev-parse', 'HEAD^{commit}') tree = run_git('rev-parse', 'HEAD^{tree}') ref = run_git('rev-parse', '--symbolic-full-name', 'HEAD') diff --git a/tests.as-root/metadata-includes-morph-version.script b/tests.as-root/metadata-includes-morph-version.script index f83712a7..772d7d50 100755 --- a/tests.as-root/metadata-includes-morph-version.script +++ b/tests.as-root/metadata-includes-morph-version.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013 - 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,8 @@ set -eu # get git version info cd "$SRCDIR" -description="$(git describe --always --dirty=-unreproducible)" +description="$(git describe --abbrev=40 --always \ + --dirty=-unreproducible --match=DO-NOT-MATCH-ANY-TAGS)" commit="$(git rev-parse 'HEAD^{commit}')" tree="$(git rev-parse 'HEAD^{tree}')" ref="$(git rev-parse --symbolic-full-name 'HEAD')" |