From 6b74e196aec228aa0de8852f784f4bc8904c14e2 Mon Sep 17 00:00:00 2001
From: Fernando Carmona Varo <ferkiwi@gmail.com>
Date: Sun, 24 Jul 2016 14:01:20 +0200
Subject: [PATCH] buildbot: retrieve short commit hash properly

Instead of trying to manually parse the output of 'git show' which can be different across different git configurations, properly use the 'git rev-parse' command that is intended for this purpose.
---
 util/buildbot/buildwin32.sh | 2 +-
 util/buildbot/buildwin64.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 78d189b87..a1132a90a 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -81,7 +81,7 @@ else
 	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
 fi
 cd minetest
-git_hash=`git show | head -c14 | tail -c7`
+git_hash=$(git rev-parse --short HEAD)
 
 # Get minetest_game
 cd games
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index e13cbd024..897f15ea8 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -76,7 +76,7 @@ else
 	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
 fi
 cd minetest
-git_hash=`git show | head -c14 | tail -c7`
+git_hash=$(git rev-parse --short HEAD)
 
 # Get minetest_game
 cd games
-- 
GitLab