opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 06:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Buildah treadmill: more allow-empty options

Browse Source 
Handle the condition where the second commit (the one making
podman-specific changes) is empty.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2024-10-21 12:33:02 -06:00
parent ba8375c9e4
commit a925c9f831
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/buildah-vendor-treadmill
View File

@ -285,7 +285,7 @@ END_FAIL_INSTRUCTIONS
exit 1;
};
progress('Reapplying treadmill patches');
git('cherry-pick', '--allow-empty', $treadmill_commit);
git('cherry-pick', '--allow-empty', '--empty=keep', $treadmill_commit);
# It worked! Clean up: remove our local die() handler and the saved branch
undef $SIG{__DIE__};