From 2d1237884bb45207702084918fe808e514be62df Mon Sep 17 00:00:00 2001
From: Meghan Denny <meghan@bun.sh>
Date: Thu, 3 Oct 2024 00:00:32 -0700
Subject: [PATCH] SetupGit.cmake: fix GIT_CHANGED_SOURCES

---
 cmake/tools/SetupGit.cmake | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/cmake/tools/SetupGit.cmake b/cmake/tools/SetupGit.cmake
index 8e0f87c312..13ac32f6a0 100644
--- a/cmake/tools/SetupGit.cmake
+++ b/cmake/tools/SetupGit.cmake
@@ -11,7 +11,28 @@ if(NOT GIT_PROGRAM)
   return()
 endif()
 
-set(GIT_DIFF_COMMAND ${GIT_PROGRAM} diff --no-color --name-only --diff-filter=AMCR origin/main HEAD)
+set(GIT_MERGEBASE_COMMAND ${GIT_PROGRAM} merge-base origin/main HEAD)
+
+execute_process(
+  COMMAND
+    ${GIT_MERGEBASE_COMMAND}
+  WORKING_DIRECTORY
+    ${CWD}
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  OUTPUT_VARIABLE
+    GIT_MERGEBASE
+  ERROR_STRIP_TRAILING_WHITESPACE
+  ERROR_VARIABLE
+    GIT_MERGEBASE_ERROR
+  RESULT_VARIABLE
+    GIT_MERGEBASE_RESULT
+)
+if(NOT GIT_MERGEBASE_RESULT EQUAL 0)
+  message(${WARNING} "Command failed: ${GIT_MERGEBASE_COMMAND} ${GIT_MERGEBASE_ERROR}")
+  return()
+endif()
+
+set(GIT_DIFF_COMMAND ${GIT_PROGRAM} diff --no-color --name-only --diff-filter=AMCR ${GIT_MERGEBASE} HEAD)
 
 execute_process(
   COMMAND