projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6de12b1
)
SCons: Attempt to deal with branches without upstream configured
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Mar 2015 09:03:54 +0000
(14:03 +0500)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Mar 2015 09:03:54 +0000
(14:03 +0500)
build_files/scons/tools/Blender.py
patch
|
blob
|
history
diff --git
a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index 060904e7cd7a0c3dfbb59d5d8cd7519c47f0e398..dbe1cafc14f00a360a6c15714949e9e3718d95e2 100644
(file)
--- a/
build_files/scons/tools/Blender.py
+++ b/
build_files/scons/tools/Blender.py
@@
-441,7
+441,7
@@
def buildinfo(lenv, build_type):
no_upstream = False
try :
- build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip()
+ build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']
, stderr=subprocess.STDOUT
).strip()
except subprocess.CalledProcessError:
# assume branch has no upstream configured
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()