mirror of
https://github.com/overte-org/overte.git
synced 2025-04-14 07:27:04 +02:00
grab correct commit hash for conflicting PR
This commit is contained in:
parent
01c4b57d11
commit
b4b0131065
1 changed files with 1 additions and 1 deletions
|
@ -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 ()
|
||||||
|
|
Loading…
Reference in a new issue