getting closer

Author: bmastbergen

.github/workflows/upstream-fix-check.yml

@@ -111,17 +111,20 @@ jobs:
               "$PR_COMMENT_BODY_ACCUMULATOR" "$UPSTREAM_LINUX_HASH"
 
             # --- Search for "Fixes:" tag in upstream Linux kernel using git log ---
-            printf -v PR_COMMENT_BODY_ACCUMULATOR "%s  Searching for upstream commits on 'master' branch in range \`%s..%s\` that fix \`%s\` using \`git log\`...\n" \
-              "$PR_COMMENT_BODY_ACCUMULATOR" "$UPSTREAM_LINUX_HASH" "$HEAD_COMMIT_SHA" "$UPSTREAM_LINUX_HASH"
+            # Extract the first 12 characters for the short SHA, commonly used in Fixes: tags in Linux kernel.
+            UPSTREAM_LINUX_HASH_SHORT=$(echo "$UPSTREAM_LINUX_HASH" | cut -c 1-12)
+            
+            printf -v PR_COMMENT_BODY_ACCUMULATOR "%s  Searching for upstream commits on 'master' branch in range \`%s..%s\` that fix \`%s\` using \`git log --grep=\"Fixes: %s\"\`...\n" \
+              "$PR_COMMENT_BODY_ACCUMULATOR" "$UPSTREAM_LINUX_HASH" "$HEAD_COMMIT_SHA" "$UPSTREAM_LINUX_HASH" "$UPSTREAM_LINUX_HASH_SHORT"
 
-            # Construct the grep pattern using the full SHA for precise matching.
-            GREP_PATTERN="Fixes: ${UPSTREAM_LINUX_HASH}"
+            # Construct the grep pattern using the SHORT SHA for search.
+            GREP_PATTERN="Fixes: ${UPSTREAM_LINUX_HASH_SHORT}"
 
-            # Use git log to find commits that mention the full SHA in their "Fixes:" line,
+            # Use git log to find commits that mention the short SHA in their "Fixes:" line,
             # in the range from the specific commit up to HEAD.
             # --pretty=format:"%h %s" to get short SHA and subject.
             # --regexp-ignore-case for case-insensitive grep.
-            # We explicitly exclude the UPSTREAM_LINUX_HASH itself from the result,
+            # We explicitly exclude the UPSTREAM_LINUX_HASH itself from the result range,
             # as we are looking for *subsequent* fixes.
             GIT_LOG_FIXES_OUTPUT=$(git -C linux log master \
                              "${UPSTREAM_LINUX_HASH}..${HEAD_COMMIT_SHA}" \