Skip to content

Commit acde518

Browse files
committed
[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 <[email protected]>
1 parent ee62e11 commit acde518

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rolling-release-update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
398398
commit_info = repo.git.show("--pretty=%h %s", "-s", ciq_commit)
399399
print(f" [{commits_applied}/{len(rolling_commit_map)}] {commit_info}")
400400
result = subprocess.run(
401-
["git", "cherry-pick", "-s", ciq_commit], stderr=subprocess.PIPE, stdout=subprocess.PIPE, cwd=args.repo
401+
["git", "cherry-pick", ciq_commit], stderr=subprocess.PIPE, stdout=subprocess.PIPE, cwd=args.repo
402402
)
403403
if result.returncode != 0:
404404
print(f"[rolling release update] ERROR: Failed to cherry-pick commit {ciq_commit}")

0 commit comments

Comments
 (0)