diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-25 14:25:35 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-25 14:25:35 +0400 |
commit | 551f3eef7403ffcd8838e1034ec1770bf3d37b7d (patch) | |
tree | 3b79d4f130724611959fc6423ded8ec29773b6f5 | |
parent | b2c1bb74b213db28a5c45f16813ca14ee985a9fe (diff) |
Show hash from latest pushed commit in buildinfo
Before this hash of latest local commit was used,
which is not so much useful since nobody can access
that commit hash.
-rw-r--r-- | build_files/cmake/buildinfo.cmake | 2 | ||||
-rw-r--r-- | build_files/scons/tools/Blender.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 2cc92df15e7..7fc052eb249 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -12,7 +12,7 @@ if(EXISTS ${SOURCE_DIR}/.git/) # The FindSubversion.cmake module is part of the standard distribution include(FindGit) if(GIT_FOUND) - execute_process(COMMAND git rev-parse --short HEAD + execute_process(COMMAND git rev-parse --short @{u} WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 894c8dbca25..9d1a6390774 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -419,7 +419,7 @@ def buildinfo(lenv, build_type): build_commit_timestamp = '0' build_branch = 'unknown' else: - build_hash = os.popen('git rev-parse --short HEAD').read().strip() + build_hash = os.popen('git rev-parse --short @{u}').read().strip() build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip() # ## Check for local modifications |