Skip to content

Commit 88dfc66

Browse files
committed
minor fix on the apply-hotfixes.sh, 1/ added -n to git cherry-pick 2/ added -X no-renames
1 parent 6517b37 commit 88dfc66

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/apply-hotfixes.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fi;
5454
# Patching commits for Client Context Manager
5555
# UPDATE: OpenAPI generator v4.3.0 has the context manager as a functionality. Cherry-picking just the tests for completeness.
5656
# Ref: https://github.com/kubernetes-client/python/pull/1073
57-
git cherry-pick -n 13dffb897617f87aaaee247095107d7011e002d5
57+
git cherry-pick -X no-renames -n 13dffb897617f87aaaee247095107d7011e002d5
5858
if [ $? -eq 0 ]
5959
then
6060
echo Succesfully patched changes for Client Context Manager
@@ -79,7 +79,7 @@ else
7979
fi;
8080

8181
# Patching commit for test_informer and test_metrics
82-
git cherry-pick b5f4b4cc504e7f10956b52de6aa676e22c8952f0
82+
git cherry-pick -n b5f4b4cc504e7f10956b52de6aa676e22c8952f0
8383
if [ $? -eq 0 ]
8484
then
8585
echo Successfully patched changes for test_informer and test_metrics

0 commit comments

Comments
 (0)