contrib: findfix: Also find fixes not applied through stable release merges
So far findfix only identified patches applied to ChromeOS branches through
stable release merges. This missed patches which were applied directly to
a ChromeOS branches. Also, findfix failed to find patches applied to
release branches by using 'git cherry-pick' since it only used stable
release SHAs to check for the presence of a patch in a release branch.
This patch adds two improvements:
- If a patch is not found in an upstream stable release, search for it in
ChromeOS branches. If found there, display
Fixed in <branch> (sha <sha>)
instead of
Fixed in <branch> with merge of <stable release version> (sha <sha>)
to note the difference.
- When searching for a patch in a release branch, use the SHA only as first
step of the search. If the SHA is not found in the release branch,
search through the release branch using a subject match followed
by a patch-id match. Mark patch as present in a release branch if both
subject and patch-id match.
BUG=None
TEST="Run on affected patch, for example 8b80d74bdb2"
Change-Id: I673f95c6621c9a05841da78e3e1f8d4700d06349
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/4908022
Commit-Queue: Guenter Roeck <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
Reviewed-by: Zubin Mithra <[email protected]>
1 file changed
