From a4c7fe50a7fec02ee846b64b5c021192bdb03439 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 13 May 2016 14:54:12 -0400
Subject: [PATCH] travis-ci proper git version

---
 .travis.yml                            |  1 +
 cmake/common/px4_base.cmake            | 14 +++++++-------
 cmake/templates/build_git_version.h.in |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ebc7fe7b2..f2da8bcf96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ addons:
     - zlib1g-dev
 
 before_install:
+  - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --all --tags
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
          pushd .
       && cd ~ && mkdir gcc && cd gcc
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 5650e0aa2a..605ee5b1ef 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -776,21 +776,21 @@ function(px4_create_git_hash_header)
 		REQUIRED HEADER
 		ARGN ${ARGN})
 	execute_process(
-		COMMAND git describe --tags
+		COMMAND git describe --always --tags
 		OUTPUT_VARIABLE git_tag
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		)
-	#message(STATUS "GIT_TAG = ${git_tag}")
+	message(STATUS "GIT_TAG = ${git_tag}")
 	execute_process(
-		COMMAND git rev-parse HEAD
-		OUTPUT_VARIABLE git_desc
+		COMMAND git rev-parse --verify HEAD
+		OUTPUT_VARIABLE git_version
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		)
-	#message(STATUS "GIT_DESC = ${git_desc}")
-	set(git_desc_short)
-	string(SUBSTRING ${git_desc} 1 16 git_desc_short)
+	#message(STATUS "GIT_VERSION = ${git_version}")
+	set(git_version_short)
+	string(SUBSTRING ${git_version} 1 16 git_version_short)
 	configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/build_git_version.h.in ${HEADER} @ONLY)
 endfunction()
 
diff --git a/cmake/templates/build_git_version.h.in b/cmake/templates/build_git_version.h.in
index 99b3551743..36e4e74e3e 100644
--- a/cmake/templates/build_git_version.h.in
+++ b/cmake/templates/build_git_version.h.in
@@ -1,5 +1,5 @@
 /* Auto Magically Generated file */
 /* Do not edit! */
-#define PX4_GIT_VERSION_STR  "@git_desc@"
-#define PX4_GIT_VERSION_BINARY 0x@git_desc_short@
+#define PX4_GIT_VERSION_STR  "@git_version@"
+#define PX4_GIT_VERSION_BINARY 0x@git_version_short@
 #define PX4_GIT_TAG_STR  "@git_tag@"