From c5033092ff7012594b0dcd1be49e4819753ec0cd Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 19 Sep 2014 16:51:23 +0100 Subject: Fix behaviour of `morph --version` 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. --- morphlib/gitversion.py | 6 ++++-- 1 file 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') -- cgit v1.2.1