From b4b0131065193e152050e0ca8afa454536d08f46 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 5 Jul 2018 14:33:21 -0700
Subject: [PATCH] grab correct commit hash for conflicting PR

---
 cmake/macros/SetPackagingParameters.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 2c8443d510..c40691c632 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -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 ()