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

Fix branch name for modules without patches

Browse Source
This commit is contained in:
Matthias Schiffer 2013-12-28 22:43:16 +01:00
parent b48cdd4f1a
commit 76167579cd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/patch.sh
View File

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