From: Hamdy Abou El Anein <info@daylightlinux.ch>
To: sashal@kernel.org
Cc: hamdy.aea@protonmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH] scripts: git-resolve: search beyond ten body-only matches
Date: Tue, 3 Nov 2026 17:42:02 +0100 [thread overview]
Message-ID: <20261103164202.129634-1-info@daylightlinux.ch> (raw)
From: Hamdy Abou El Anein <hamdy.aea@protonmail.com>
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.
Remove the premature limit. The existing reader still 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 now 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@protonmail.com>
---
scripts/git-resolve.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/git-resolve.sh b/scripts/git-resolve.sh
index 0be8838cd13..4b51d40bebf 100755
--- a/scripts/git-resolve.sh
+++ b/scripts/git-resolve.sh
@@ -74,7 +74,7 @@ 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 | \
+ match=$(git log --format="%H %s" --grep="$grep_pattern" --perl-regexp | \
while read -r hash subject; do
if echo "$subject" | grep -qP "$grep_pattern"; then
echo "$hash"
next reply other threads:[~2026-11-03 16:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 16:42 Hamdy Abou El Anein [this message]
2026-11-03 17:26 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261103164202.129634-1-info@daylightlinux.ch \
--to=info@daylightlinux.ch \
--cc=hamdy.aea@protonmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®