[Bf-blender-cvs] [6de12b1] master: CMake: Suppress unconfigured branch upstream error in the output

Sergey Sharybin noreply at git.blender.org
Fri Mar 20 10:04:32 CET 2015


Commit: 6de12b1b43f846f786abc903b992d9493900f76f
Author: Sergey Sharybin
Date:   Fri Mar 20 13:59:05 2015 +0500
Branches: master
https://developer.blender.org/rB6de12b1b43f846f786abc903b992d9493900f76f

CMake: Suppress unconfigured branch upstream error in the output

===================================================================

M	build_files/cmake/buildinfo.cmake

===================================================================

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 8ef29b0..74c1f8f 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -60,7 +60,8 @@ if(EXISTS ${SOURCE_DIR}/.git)
 			execute_process(COMMAND git log HEAD..@{u}
 			                WORKING_DIRECTORY ${SOURCE_DIR}
 			                OUTPUT_VARIABLE _git_below_check
-			                OUTPUT_STRIP_TRAILING_WHITESPACE)
+			                OUTPUT_STRIP_TRAILING_WHITESPACE
+			                ERROR_QUIET)
 			if(NOT _git_below_check STREQUAL "")
 				# If there're commits between HEAD and upstream this means
 				# that we're reset-ed to older revision. Use it's hash then.




More information about the Bf-blender-cvs mailing list