Skip to content
Snippets Groups Projects
Commit cfe3b79c authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

Fix `make patch' for more than one patch file

parent 1f0cfbc5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
scripts/patch.sh
+ 1
− 1
View file @ cfe3b79c
...@@ -9,7 +9,7 @@ for module in $GLUON_MODULES; do ...@@ -9,7 +9,7 @@ for module in $GLUON_MODULES; do
cd "$1"/$module cd "$1"/$module
git checkout -B patching base git checkout -B patching base
if [ "$1"/patches/$module/*.patch ]; then if [ "$(echo "$1"/patches/$module/*.patch)" ]; then
git am "$1"/patches/$module/*.patch || ( git am "$1"/patches/$module/*.patch || (
git am --abort git am --abort
git checkout patched git checkout patched
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment