diff options
| author |   Tomáš Levora <t.levora@partner.samsung.com> | 2019-02-08 10:07:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-08 10:07:11 +0000 |
| commit | fe2d638b68c74897c9b2ef7bccd1a323f8435f59 (patch) | |
| tree | 4c938d34d9d72b47b0f941228c76741e711385ff /build | |
| parent | fb8f58abe4fd3a70b9a6876aec1a57f76f1a3f4a (diff) | |
| parent | c9ea08f25a8764d2ad281faa722f03dc4fff1534 (diff) | |
Merge "Use git format of patches"
Diffstat (limited to 'build')
| -rwxr-xr-x | build/fetch_and_patch_charts.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/fetch_and_patch_charts.sh b/build/fetch_and_patch_charts.sh index 5000dbf5..cde42656 100755 --- a/build/fetch_and_patch_charts.sh +++ b/build/fetch_and_patch_charts.sh @@ -51,6 +51,7 @@ fi # git and patch tools are preconditions for this to work CURR=1 TOTAL=5 +PATCH_FILE=$(realpath "${3}") echo -e "${_G}[Step $((CURR++))/${TOTAL} cloning repo with charts to be patched]${C_}" git clone "${1}" "${4}" @@ -62,7 +63,7 @@ echo -e "${_G}[Step $((CURR++))/${TOTAL} git-checkout to correct base]${C_}" git checkout "${2}" echo -e "${_G}[Step $((CURR++))/${TOTAL} patching charts]${C_}" -patch -p0 < "${3}" +git apply "${PATCH_FILE}" echo -e "${_G}[Step $((CURR++))/${TOTAL} returning to original working directory]${C_}" popd |