Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13554 from birarda/bug/conflicted-pr-build

Browse source 
grab correct commit hash for conflicting PR
This commit is contained in:
Stephen Birarda 2018-07-05 15:43:32 -07:00 committed by GitHub
commit 9fc5ba0d8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/SetPackagingParameters.cmake
View file

@ -90,7 +90,7 @@ macro(SET_PACKAGING_PARAMETERS)
# for the second parent of HEAD (not HEAD) since that is the # for the second parent of HEAD (not HEAD) since that is the
# SHA of the commit merged to master for the build # SHA of the commit merged to master for the build
if (PR_BUILD) if (PR_BUILD)
set(_GIT_LOG_FORMAT "%p") set(_GIT_LOG_FORMAT "%p %h")
else () else ()
set(_GIT_LOG_FORMAT "%h") set(_GIT_LOG_FORMAT "%h")
endif () endif ()