nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix `make patch' for more than one patch file

Browse Source
This commit is contained in:
Matthias Schiffer 2014-01-09 20:20:34 +01:00
parent 1f0cfbc521
commit cfe3b79ca8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/patch.sh
View File

@ -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