Merge pull request #8949 from bwiseman77/v4.0.x

v4.0.x: CI: Fix a bug in the cherry pick checker.

Author: hppritcha

.github/workflows/git-commit-checks.py

@@ -186,6 +186,7 @@ def _is_entirely_submodule_updates(repo, commit):
         return GOOD, "skipped (submodules updates)"
 
     non_existent = dict()
+    unmerged = dict()
     found_cherry_pick_line = False
     for match in prog_cp.findall(commit.message):
         found_cherry_pick_line = True
@@ -195,9 +196,11 @@ def _is_entirely_submodule_updates(repo, commit):
             # These errors mean that the git library recognized the
             # hash as a valid commit, but the GitHub Action didn't
             # fetch the entire repo, so we don't have all the meta
-            # data about this commit.  Bottom line: it's a good hash.
-            # So -- no error here.
-            pass
+            # data about this commit. This occurs because the commit
+            # only exists in an as-yet unmerged pull request on github. Therefore, we
+            # want to fail this commit until the corresponding pull request
+            # is merged.
+            unmerged[match] = True
         except git.BadName as e:
             # Use a dictionary to track the non-existent hashes, just
             # on the off chance that the same non-existent hash exists
@@ -208,15 +211,27 @@ def _is_entirely_submodule_updates(repo, commit):
 
     # Process the results for this commit
     if found_cherry_pick_line:
-        if len(non_existent) == 0:
+        if len(non_existent) == 0 and len(unmerged) == 0:
             return GOOD, None
-        else:
+        elif len(non_existent) > 0 and len(unmerged) == 0:
             str = f"contains a cherry pick message that refers to non-existent commit"
             if len(non_existent) > 1:
                 str += "s"
             str += ": "
             str += ", ".join(non_existent)
             return BAD, str
+        elif len(non_existent) == 0 and len(unmerged) > 0:
+            str = f"contains a cherry pick message that refers to a commit that exists, but is in an as-yet unmerged pull request"
+            if len(non_existent) > 1:
+                str += "s"
+            str += ": "
+            str += ", ".join(unmerged)
+            return BAD, str
+        else:
+            str = f"contains a cherry pick message that refers to both non-existent commits and commits that exist but are in as-yet unmerged pull requests"
+            str += ": "
+            str += ", ".join(non_existent + unmerged)
+            return BAD, str
 
     else:
         if config['cherry pick required']: