Commits

md_5 authored a93cbb1e986
BUILDTOOLS-561: Improve support for paths with special characters
No tags

applyPatches.sh

Modified
17 17 echo "Resetting $target to $what..."
18 18 git config commit.gpgSign false
19 19 git remote rm origin >/dev/null 2>&1
20 20 git remote add origin ../../$what >/dev/null 2>&1
21 21 git checkout master >/dev/null 2>&1
22 22 git fetch origin >/dev/null 2>&1
23 23 git reset --hard $branch
24 24
25 25 echo " Applying patches to $target..."
26 26 git am --abort >/dev/null 2>&1
27 - git am --3way "$basedir/${what}-Patches/"*.patch
27 + git am --3way "../${what}-Patches/"*.patch
28 28 if [ "$?" != "0" ]; then
29 29 echo " Something did not apply cleanly to $target."
30 30 echo " Please review above details and finish the apply then"
31 31 echo " save the changes with rebuildPatches.sh"
32 32 exit 1
33 33 else
34 34 echo " Patches applied cleanly to $target"
35 35 fi
36 36 }
37 37

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut