From 0dc09e604af2d095d9c49bf2e38a33a7db6b8ce8 Mon Sep 17 00:00:00 2001 From: Roxana Nicolescu Date: Mon, 15 Dec 2025 14:44:51 +0100 Subject: [PATCH] [RR] Do not add signoff when cherry picking commits During "rebase", the ciq commits are cherry picked one by one from the branch that contains the previous version of kernel. Since they are already signed off, there's no need to add another signoff. Moreover, this ends up appending signoffs every time a new rolling release update is done, polutting the commit message. Signed-off-by: Roxana Nicolescu --- rolling-release-update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rolling-release-update.py b/rolling-release-update.py index 7b14ac7..e90cfaf 100644 --- a/rolling-release-update.py +++ b/rolling-release-update.py @@ -398,7 +398,7 @@ def check_for_fips_protected_changes(repo, branch, common_tag): commit_info = repo.git.show("--pretty=%h %s", "-s", ciq_commit) print(f" [{commits_applied}/{len(rolling_commit_map)}] {commit_info}") result = subprocess.run( - ["git", "cherry-pick", "-s", ciq_commit], stderr=subprocess.PIPE, stdout=subprocess.PIPE, cwd=args.repo + ["git", "cherry-pick", ciq_commit], stderr=subprocess.PIPE, stdout=subprocess.PIPE, cwd=args.repo ) if result.returncode != 0: print(f"[rolling release update] ERROR: Failed to cherry-pick commit {ciq_commit}")