[Bf-blender-cvs] [3b35d9d667d] blender-v3.4-release: Fix T100905: Official releases have the wrong branch in buildinfo
Sergey Sharybin
noreply at git.blender.org
Wed Nov 16 14:55:45 CET 2022
Commit: 3b35d9d667d4e498a842a8896e61ddd7edd5baf9
Author: Sergey Sharybin
Date: Wed Nov 16 14:52:47 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB3b35d9d667d4e498a842a8896e61ddd7edd5baf9
Fix T100905: Official releases have the wrong branch in buildinfo
This is really old decision which should have been revisited as soon
as an overlapped release cycle was introduced.
The initial reasoning for such branch name override was to make it so
corrective releases have the same branch as the initial release when
we followed fully linear release cycle.
Nowadays such branch override is confusing and could even be misleading.
There are no add-ons using this property so it is very unlikely that
this is a breaking change.
===================================================================
M build_files/cmake/buildinfo.cmake
===================================================================
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index b0640acbe96..12ba07bf578 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -103,10 +103,6 @@ if(EXISTS ${SOURCE_DIR}/.git)
endif()
endif()
- if(MY_WC_BRANCH MATCHES "^blender-v")
- set(MY_WC_BRANCH "master")
- endif()
-
unset(_git_below_check)
endif()
More information about the Bf-blender-cvs
mailing list