fix: make merge base fetching more robust
Several static check scripts rely on identifying the Git merge base via
get_merge_base, which may fail if the local Git history is too shallow.
This causes issues when checking patches on CI or LTS branches with
limited fetch depth.
To address this:
- Reuse a single evaluated merge_base instead of invoking get_merge_base
multiple times.
- If merge_base is not found initially, attempt to fetch more history
from the remote using the appropriate GERRIT_REFSPEC.
- Exit with an error if a merge base cannot be found even after
fetching.
This improves reliability of static checks when working on partial
clones or CI environments where fetch depth is restricted.
Change-Id: Icccec0eb2f29d254e54bbd6b639f6c1ef11291a3
Signed-off-by: Harrison Mutai <harrison.mutai@arm.com>
(cherry picked from commit 789decfc87c56fc559c6b0212f82217cbc905797)
diff --git a/script/static-checks/static-checks-include-order.sh b/script/static-checks/static-checks-include-order.sh
index 364929c..21fcb72 100755
--- a/script/static-checks/static-checks-include-order.sh
+++ b/script/static-checks/static-checks-include-order.sh
@@ -17,7 +17,7 @@
TEST_CASE="Order of includes on the patch series"
echo "# $TEST_CASE"
"$CI_ROOT/script/static-checks/check-include-order.py" --tree "$1" \
- --patch --from-ref $(get_merge_base) \
+ --patch --from-ref ${merge_base} \
&> "$LOG_FILE"
else
echo "# Check order of includes of the entire source tree"