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

Fix branch name for modules without patches

parent b48cdd4f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 7 deletions
scripts/patch.sh
+ 8
− 7
View file @ 76167579
...@@ -9,13 +9,14 @@ for module in $GLUON_MODULES; do ...@@ -9,13 +9,14 @@ for module in $GLUON_MODULES; do
dir="$1"/$module dir="$1"/$module
git -C $dir checkout -B patching base git -C $dir checkout -B patching base
if [ -z "$1"/patches/$module/*.patch ]; then continue; fi if [ "$1"/patches/$module/*.patch ]; then
git -C "$dir" am "$1"/patches/$module/*.patch || ( git -C "$dir" am "$1"/patches/$module/*.patch || (
git -C "$dir" am --abort git -C "$dir" am --abort
git -C "$dir" checkout patched git -C "$dir" checkout patched
git -C "$dir" branch -D patching git -C "$dir" branch -D patching
false false
) )
fi
git -C "$dir" checkout -B patched git -C "$dir" checkout -B patched
git -C "$dir" branch -d patching git -C "$dir" branch -d patching
done done
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