Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions agents_as_skills/backport/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ a backport that won't actually fix the shipped RPM.
- The tool automatically uses the base commit recorded in step 4e to include
ALL cherry-picked commits, not just the last one
- For multi-patch (when maintainer rules request one patch per commit),
use `run_shell_command` with `git format-patch -1 <hash> --stdout > <name>`
use `run_shell_command` with `git format-patch --no-signature -1 <hash> --stdout > <name>`
per commit instead of `git_patch_create`
- IMPORTANT: Only create NEW patch files. Do NOT modify
existing patches in the dist-git repository
Expand Down Expand Up @@ -561,7 +561,7 @@ a backport that won't actually fix the shipped RPM.
(default: `<JIRA_ISSUE>.patch`) in the current working
directory (the dist-git repository root)
- The tool automatically captures all applied changes into one patch file.
- For multi-patch, use `run_shell_command` with `git format-patch`
- For multi-patch, use `run_shell_command` with `git format-patch --no-signature`
per commit instead of `git_patch_create`

5. Update the spec file. Add new `Patch` tag(s) for each patch file generated in step 4.
Expand Down Expand Up @@ -872,7 +872,7 @@ a backport that won't actually fix the shipped RPM.
- The tool automatically uses the base commit recorded in step 3i to include
ALL cherry-picked commits, not just the last one
- For multi-patch (when maintainer rules request one patch per commit),
use `run_shell_command` with `git format-patch -1 <hash> --stdout > <name>`
use `run_shell_command` with `git format-patch --no-signature -1 <hash> --stdout > <name>`
per commit instead of `git_patch_create`
- IMPORTANT: Only create NEW patch files. Do NOT modify
existing patches in the dist-git repository
Expand Down Expand Up @@ -909,7 +909,7 @@ a backport that won't actually fix the shipped RPM.
(default: `<JIRA_ISSUE>.patch`) in the current working
directory (the dist-git repository root)
- The tool automatically captures all applied changes into one patch file.
- For multi-patch, use `run_shell_command` with `git format-patch`
- For multi-patch, use `run_shell_command` with `git format-patch --no-signature`
per commit instead of `git_patch_create`

4. Update the spec file. Add new `Patch` tag(s) for each patch file generated above.
Expand Down
4 changes: 2 additions & 2 deletions ymir/agents/prompts/backport/instructions.j2
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ a backport that won't actually fix the shipped RPM.
- The tool automatically uses the base commit recorded in step 4e to include
ALL cherry-picked commits, not just the last one
- For multi-patch (when maintainer rules request one patch per commit),
use `run_shell_command` with `git format-patch -1 <hash> --stdout > <name>`
use `run_shell_command` with `git format-patch --no-signature -1 <hash> --stdout > <name>`
per commit instead of `git_patch_create`
- IMPORTANT: Only create NEW patch files. Do NOT modify
existing patches in the dist-git repository
Expand Down Expand Up @@ -244,7 +244,7 @@ a backport that won't actually fix the shipped RPM.
(default: `<JIRA_ISSUE>.patch`) in the current working
directory (the dist-git repository root)
- The tool automatically captures all applied changes into one patch file.
- For multi-patch, use `run_shell_command` with `git format-patch`
- For multi-patch, use `run_shell_command` with `git format-patch --no-signature`
per commit instead of `git_patch_create`

5. Update the spec file. Add new `Patch` tag(s) for each patch file generated in step 4.
Expand Down
4 changes: 2 additions & 2 deletions ymir/agents/prompts/backport/instructions_zstream.j2
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ a backport that won't actually fix the shipped RPM.
- The tool automatically uses the base commit recorded in step 3i to include
ALL cherry-picked commits, not just the last one
- For multi-patch (when maintainer rules request one patch per commit),
use `run_shell_command` with `git format-patch -1 <hash> --stdout > <name>`
use `run_shell_command` with `git format-patch --no-signature -1 <hash> --stdout > <name>`
per commit instead of `git_patch_create`
- IMPORTANT: Only create NEW patch files. Do NOT modify
existing patches in the dist-git repository
Expand Down Expand Up @@ -241,7 +241,7 @@ a backport that won't actually fix the shipped RPM.
(default: `<JIRA_ISSUE>.patch`) in the current working
directory (the dist-git repository root)
- The tool automatically captures all applied changes into one patch file.
- For multi-patch, use `run_shell_command` with `git format-patch`
- For multi-patch, use `run_shell_command` with `git format-patch --no-signature`
per commit instead of `git_patch_create`

4. Update the spec file. Add new `Patch` tag(s) for each patch file generated above.
Expand Down
2 changes: 1 addition & 1 deletion ymir/tools/unprivileged/wicked_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ async def _run(
"or 'apply_downstream_patches' is run before this tool. "
f"Options: {self.options}"
)
cmd = ["git", "format-patch", "--stdout", f"{base_commit_sha}..HEAD"]
cmd = ["git", "format-patch", "--no-signature", "--stdout", f"{base_commit_sha}..HEAD"]
exit_code, stdout, stderr = await run_subprocess(cmd, cwd=tool_input.repository_path)
if exit_code != 0:
raise ToolError(f"Command git-format-patch failed: {stderr}")
Expand Down
Loading