From e886e98d8a2be2f29e1b8b24c5ddb3375c05dcf2 Mon Sep 17 00:00:00 2001
From: Douglas Araujo <douglas.araujo@ess.eu>
Date: Tue, 11 Mar 2025 16:22:31 +0100
Subject: [PATCH] Improve Git diff file generation by avoiding 'touch' fallback
---
configure/E3/RULES_E3 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3
index b620ef4c..a4767537 100644
--- a/configure/E3/RULES_E3
+++ b/configure/E3/RULES_E3
@@ -68,7 +68,11 @@ build: consistency_checks checkout prebuild db_internal
@echo "wrapper_url: '$(${E3_MODULE_NAME}_E3_GIT_URL)'" > ${COMMON_DIR}/${METAFILE}
@echo "wrapper_git_ref: '$(${E3_MODULE_NAME}_E3_GIT_DESC)'" >> ${COMMON_DIR}/${METAFILE}
@echo "Generating Git diff file ${COMMON_DIR}/${BUILD_DIFF_FILE}"
- @git diff > ${COMMON_DIR}/${BUILD_DIFF_FILE} || touch ${COMMON_DIR}/${BUILD_DIFF_FILE}
+ @if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then \
+ git diff > ${COMMON_DIR}/${BUILD_DIFF_FILE}; \
+ else \
+ > ${COMMON_DIR}/${BUILD_DIFF_FILE}; \
+ fi
## Run module-specific commands before building
prebuild: consistency_checks
--
GitLab