[PATCH v2] scripts: git-resolve: search beyond ten body-only matches

[Hamdy Abou El Anein]

From: Hamdy Abou El Anein <hamdy.aea@xxxxxxxxxxxxxx>

The forced subject lookup asks git log for at most ten matches before
checking their subjects. Since --grep also searches message bodies, ten
newer body-only matches can hide an older commit with the requested
subject.

Match commit subjects directly, so body-only matches cannot hide an
older subject and grep stops at the first matching subject.

Tested with a target commit followed by eleven commits whose bodies,
but not subjects, match the query. Forced lookup returns the target.

AI assistance: ChatGPT/Codex identified the issue and prepared the
change, commit message and executable regression tests.

Fixes: 7ae52a3d7f51 ("scripts: Add git-resolve tool for full SHA-1 resolution")

Signed-off-by: Hamdy Abou El Anein <hamdy.aea@xxxxxxxxxxxxxx>
---
 scripts/git-resolve.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/git-resolve.sh b/scripts/git-resolve.sh
index 7d14cf279e86..f04a56c5fba0 100755
--- a/scripts/git-resolve.sh
+++ b/scripts/git-resolve.sh
@@ -74,13 +74,8 @@ git_resolve_commit() {
 		if [ ${#matches[@]} -eq 0 ] && [ $force -eq 1 ]; then
 			# Use git log to search, but filter to ensure subject matches exactly
 			local match
-			match=$(git log --format="%H %s" --grep="$grep_pattern" --perl-regexp -10 | \
-					while read -r hash subject; do
-						if echo "$subject" | grep -qP "$grep_pattern"; then
-							echo "$hash"
-							break
-						fi
-					done)
+			match=$(git log --format="%H %s" | \
+				grep -m1 -P "^[0-9a-f]+ ${grep_pattern#^}" | cut -d" " -f1)
 			if [ -n "$match" ]; then
 				echo "$match"
 				return 0
-- 
2.56.0