forked from bartvdbraak/blender
SCons: Attempt to deal with branches without upstream configured
This commit is contained in:
parent
6de12b1b43
commit
6f51df5384
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user