Skip to content

git-backport: Add z-stream option

Prarit Bhargava requested to merge prarit/tools:for_crecklin into main

Add an option to create a z-stream backport, -z. This option formats the
commit body with a Y-Commit and either a O-Bugzilla or O-JIRA (depending
on the Y-Commit's ticket). This option also strips the Bugzilla: or JIRA:
field from the Y commit's body.

The -z option can use -j, -b, and -c to include Jira, Bugzilla, and CVE
information.

A word of caution on using -z: The commit ID passed into git-backport is
the actual Y-stream commit ID and NOT the upstream commit ID.

For example, to create a z-stream backport for centos-stream-9 commit
f98298cffc03 ("x86/MCE/AMD: Allow thresholding interface updates after
init") which is a backport of linux commit 1f52b0aba6fd, a user would
execute

git-backport -z f98298cffc03

ie) git-backport uses the actual Y-stream commit ID, and not the upstream
commit ID.

Signed-off-by: Prarit Bhargava prarit@redhat.com

Merge request reports