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:
Diffstat (limited to 'build_files/scons/tools/Blender.py')
-rw-r--r--build_files/scons/tools/Blender.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index fc4121a5934..4ceadc7b0a4 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -430,6 +430,11 @@ def buildinfo(lenv, build_type):
master_check = os.popen('git branch --list master --contains ' + build_hash).read().strip()
if master_check == 'master':
build_branch = 'master'
+ else:
+ head_hash = os.popen('git rev-parse HEAD').read().strip()
+ tag_hashes = os.popen('git show-ref --tags -d').read()
+ if tag_hashes.find(head_hash) != -1:
+ build_branch = 'master'
if build_hash == '':
build_hash = os.popen('git rev-parse --short HEAD').read().strip()