From acdf3f26c313f24df915b75169407b260901d170 Mon Sep 17 00:00:00 2001
From: Kamran Abdul Aziz <kamran@shifteq.com>
Date: Wed, 30 Sep 2026 13:53:45 +0530
Subject: [PATCH] Report the first line of text from the commit message

A commit message can start with a blank line, or contain nothing but the
git-svn-id line, and the Reporter API rejects an empty message. Taking the
first line of the message as-is then fails the whole upload, which is what
happened on r63330 and on nine older revisions. Report the first line of
actual text instead, and fall back to the revision when there is none.

Fixes #335.
---
 report.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/report.php b/report.php
index b45ee39..1bb32f0 100644
--- a/report.php
+++ b/report.php
@@ -42,10 +42,31 @@
 /*
  * Retrieve the SVN commit message from the repository's Git log.
  *
- * The `git log` command is used to fetch the commit message being tested.
+ * The `git log` command is used to fetch the commit message being tested, and
+ * its first line of actual text is reported. A commit message can start with a
+ * blank line (r63330, for example) or contain nothing but the git-svn-id line,
+ * and the Reporter API rejects an empty message, so taking the first line as-is
+ * would fail the whole upload. When no text is found, the revision label is used.
  */
 log_message( 'Getting SVN message' );
-$message = trim( exec( 'git --git-dir=' . escapeshellarg( $runner_vars['WPT_PREPARE_DIR'] ) . '/.git log -1 --pretty=%B | head -1' ) );
+$message       = '';
+$message_lines = array();
+exec( 'git --git-dir=' . escapeshellarg( $runner_vars['WPT_PREPARE_DIR'] ) . '/.git log -1 --pretty=%B', $message_lines );
+
+foreach ( $message_lines as $message_line ) {
+	$message_line = trim( $message_line );
+
+	if ( '' === $message_line || 0 === strpos( $message_line, 'git-svn-id:' ) ) {
+		continue;
+	}
+
+	$message = $message_line;
+	break;
+}
+
+if ( '' === $message ) {
+	$message = 'r' . $rev;
+}
 
 /**
  * Prepares the file path for copying the junit.xml results.