diff options
| author | Fernando Carmona Varo <ferkiwi@gmail.com> | 2016-07-24 14:01:20 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2016-07-29 00:20:54 +0200 |
| commit | 6b74e196aec228aa0de8852f784f4bc8904c14e2 (patch) | |
| tree | 9b27d1bf4548e3b53008ca73458d144cad2254d0 /util/buildbot | |
| parent | 919d9d791c7dd2336792c5569a0604b062c8adc8 (diff) | |
| download | minetest-6b74e196aec228aa0de8852f784f4bc8904c14e2.tar.gz minetest-6b74e196aec228aa0de8852f784f4bc8904c14e2.tar.bz2 minetest-6b74e196aec228aa0de8852f784f4bc8904c14e2.zip | |
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.
Diffstat (limited to 'util/buildbot')
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 2 | ||||
| -rwxr-xr-x | 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 |