[xen master] automation/eclair: avoid failure in case of missing merge point

[patchbot@xxxxxxx]

commit 4a6448fd6497ad7952cd0baacec1869f6791de9e
Author:     Simone Ballarin <simone.ballarin@xxxxxxxxxxx>
AuthorDate: Tue Aug 1 11:57:04 2023 +0200
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Thu Aug 3 18:17:14 2023 -0700

    automation/eclair: avoid failure in case of missing merge point
    
    In the context of an auto pull request, when a common merge point
    is not found the integration will continue the analysis without
    failing.
    
    Signed-off-by: Simone Ballarin <simone.ballarin@xxxxxxxxxxx>
    Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 automation/eclair_analysis/ECLAIR/action.settings | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/automation/eclair_analysis/ECLAIR/action.settings 
b/automation/eclair_analysis/ECLAIR/action.settings
index 528bc24c72..f96368ffc7 100644
--- a/automation/eclair_analysis/ECLAIR/action.settings
+++ b/automation/eclair_analysis/ECLAIR/action.settings
@@ -138,7 +138,9 @@ auto_pull_request)
     git remote add autoPRRemote "${autoPRRemoteUrl}"
     git fetch -q autoPRRemote
     subDir="${ref}"
-    baseCommitId=$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD)
+    if ! baseCommitId=$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD); 
then
+        baseCommitId=no_merge_point
+    fi
     jobHeadline="ECLAIR ${ANALYSIS_KIND} on repository ${repository}: 
${pushUser} wants to merge ${repository}:${ref} (${headCommitId}) into 
${autoPRRepository}/${autoPRBranch} (${baseCommitId})"
     ;;
 *)
--
generated by git-patchbot for /home/xen/git/xen.git#master