|
@@ -6,17 +6,17 @@ shopt -s nullglob
|
|
|
. "$1"/modules
|
|
|
|
|
|
for module in $GLUON_MODULES; do
|
|
|
- dir="$1"/$module
|
|
|
- git -C $dir checkout -B patching base
|
|
|
+ cd "$1"/$module
|
|
|
+ git checkout -B patching base
|
|
|
|
|
|
if [ "$1"/patches/$module/*.patch ]; then
|
|
|
- git -C "$dir" am "$1"/patches/$module/*.patch || (
|
|
|
- git -C "$dir" am --abort
|
|
|
- git -C "$dir" checkout patched
|
|
|
- git -C "$dir" branch -D patching
|
|
|
+ git am "$1"/patches/$module/*.patch || (
|
|
|
+ git am --abort
|
|
|
+ git checkout patched
|
|
|
+ git branch -D patching
|
|
|
false
|
|
|
)
|
|
|
fi
|
|
|
- git -C "$dir" checkout -B patched
|
|
|
- git -C "$dir" branch -d patching
|
|
|
+ git checkout -B patched
|
|
|
+ git branch -d patching
|
|
|
done
|