Skip to content

Commit

Permalink
Merge pull request tektoncd#540 from chmouel/update-apply-patch
Browse files Browse the repository at this point in the history
Use patch -p1 instead of git am to apply patch
  • Loading branch information
openshift-merge-robot authored Oct 7, 2020
2 parents 55bef89 + 8a5ddbe commit 8bd6b79
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion openshift/release/update-to-head.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8bd6b79

Please sign in to comment.