Skip to content

introduce `commit_in_branch.py` script to help devs figure this out

Eric Engestrom requested to merge eric/mesa:commit-to-branches into master

It's been pointed out to me that determining whether a commit is present in a stable branch is non-trivial (cherry-picks are a pain to search for) and the commands are hard to remember, making it too much to ask.

This script aims to solve that problem; at its simplest form, it only takes a commit and a branch and tells the user whether that commit predates the branch, was cherry-picked to it, or is not present in any form in the branch.

$ bin/commit_in_branch.py e58a10af640ba58b6001f5c5ad750b782547da76 fdo/20.1
Commit e58a10af640ba58b6001f5c5ad750b782547da76 is in branch 20.1
$ echo $?
0

$ bin/commit_in_branch.py dd2bd68fa69124c86cd008b256d06f44fab8e6cd fdo/20.1
Commit dd2bd68fa69124c86cd008b256d06f44fab8e6cd was backported to branch 20.1 as commit d043d24654c851f0be57dbbf48274b5373dea42b
$ echo $?
0

$ bin/commit_in_branch.py master fdo/20.1
Commit 2fbcfe170bf50fcbcd2fc70a564a4d69096d968c is NOT in branch 20.1
$ echo $?
1

Merge request reports