diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-19 16:51:23 +0100 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-19 16:58:27 +0100 |
commit | c5033092ff7012594b0dcd1be49e4819753ec0cd (patch) | |
tree | 66a8194331f7ee28d271b84f83d9a9779b08d337 | |
parent | a32de7934cce79dda2b8dc20be1c5ec94109869e (diff) | |
download | morph-baserock/pedroalvarez/morph-help-fix.tar.gz |
Fix behaviour of `morph --version`baserock/pedroalvarez/morph-help-fix
Currently, if morph is installed in the system, `morph --version`
prints the sha1 of the version installed.
$ morph --version
e8adedb8f3f27d9212caf277b8e8f7c6792a20c2
If you run morph from git, the output will be something similar to
the following.
$ morph --version
baserock-14.26-124-g7b73af4
This patch changes the behaviour of the latter to match the former.
-rw-r--r-- | morphlib/gitversion.py | 6 |
1 files changed, 4 insertions, 2 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') |