Merge branch 'pl-ci-foss-empty-commit' into 'master'

CI: Allow empty commits when FOSS branch is prepared

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144599



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Peter Leitzen <pleitzen@gitlab.com>

.gitlab/ci/as-if-foss.gitlab-ci.yml

@@ -15,6 +15,7 @@ prepare-as-if-foss-branch:
   before_script:
     - git clone --single-branch --branch master "${FOSS_REPOSITORY}" gitlab-foss
     - git -C gitlab-foss checkout -b "${AS_IF_FOSS_BRANCH}" master
+    - git -C gitlab-foss rev-parse HEAD
     - rm -r .git/
     - mv gitlab-foss/.git .
     - rm -r gitlab-foss
@@ -29,7 +30,9 @@ prepare-as-if-foss-branch:
     - rm -f CHANGELOG-EE.md
     - rm -f changelogs/*-ee.md
     - git add -A
-    - git commit -m 'Update from merge request'  # TODO: Mark which SHA we add
+    # --allow-empty accounts for the edge case where FOSS matchess EE repository
+    # and a merge request only contains EE related changes.
+    - git commit -m 'Update from merge request' --allow-empty # TODO: Mark which SHA we add
     - git push -f "${FOSS_REPOSITORY}" "${AS_IF_FOSS_BRANCH}"
 
 prepare-as-if-foss-env: