From 8a5ddbee803c0b648d4b02e2575949390f668cf5 Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Wed, 7 Oct 2020 15:39:54 +0200 Subject: [PATCH] Use patch -p1 instead of git am to apply patch Signed-off-by: Chmouel Boudjnah --- openshift/release/update-to-head.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/release/update-to-head.sh b/openshift/release/update-to-head.sh index 1304733dcb0..3e96e4f5c20 100755 --- a/openshift/release/update-to-head.sh +++ b/openshift/release/update-to-head.sh @@ -24,7 +24,7 @@ git commit -m ":open_file_folder: Update openshift specific files." if [[ -d openshift/patches ]];then for f in openshift/patches/*.patch;do [[ -f ${f} ]] || continue - git am ${f} + patch -p1 -i "${f}" done fi