From: David Goulet <dgoulet@efficios.com>
Date: Tue, 29 Jul 2014 15:38:44 +0000 (-0400)
Subject: Fix: always use git describe --all --long for the git version
X-Git-Tag: v2.6.0-rc1~92
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=ed343076683ad0b7b7aaa557e30f97429efb82f3;hp=ceb6ba5100c73f6a2b39475c89f3317d64fc9b48

Fix: always use git describe --all --long for the git version

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/include/Makefile.am b/include/Makefile.am
index d2061f1e0..767b05b5d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,8 +21,7 @@ version.h:
 			git_version=""; \
 		else \
 			git_describe="$$(git describe)"; \
-			if [ "$${git_branch}" == "$${git_describe}" ] || \
-				[ "$${git_branch}" == "heads/master" ]; then \
+			if [ "$${git_branch}" == "$${git_describe}" ]; then \
 				git_version="$${git_describe}"; \
 			else \
 				git_version="$$(git describe --long --all)"; \