grab correct commit hash for conflicting PR

This commit is contained in:
Stephen Birarda 2018-07-05 14:33:21 -07:00
parent 01c4b57d11
commit b4b0131065

View file

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