Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-11-28 00:25:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-11-28 00:25:09 +0400
commitaf7a2a3b6a08bdbe99d295e593e770af165eb0e6 (patch)
treea5ba7a4ebd45ba59ac063d8e8e15c30d4fce3312 /build_files/scons/tools
parent1d2c4357d5faf7417997291efcebcb4cb72791c3 (diff)
Fix buildinfo hash for cases there's no upstream set for the branch
Diffstat (limited to 'build_files/scons/tools')
-rw-r--r--build_files/scons/tools/Blender.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 9d1a6390774..0f02502db60 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -422,6 +422,9 @@ def buildinfo(lenv, build_type):
build_hash = os.popen('git rev-parse --short @{u}').read().strip()
build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip()
+ if build_hash == '':
+ build_hash = os.popen('git rev-parse --short HEAD').read().strip()
+
# ## Check for local modifications
has_local_changes = False