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

scripts/patch.sh: apply patches in a loop instead of a single git am command

Browse Source 
Using a loop makes the script a bit nicer, and it works around a git bug
corrupting patch dates when multiple patches are applied at once.
This commit is contained in:
Matthias Schiffer 2015-10-08 23:11:44 +02:00
parent 4b3090f809
commit 0f91fa6fa8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/patch.sh
View File

@ -9,13 +9,13 @@ for module in $GLUON_MODULES; do
cd "$GLUONDIR"/$module cd "$GLUONDIR"/$module
git checkout -B patching base git checkout -B patching base
if [ "$(echo "$GLUONDIR"/patches/$module/*.patch)" ]; then for patch in "$GLUONDIR"/patches/$module/*.patch; do
git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' am --whitespace=nowarn "$GLUONDIR"/patches/$module/*.patch || ( if ! git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' am --whitespace=nowarn "$patch"; then
git am --abort git am --abort
git checkout patched git checkout patched
git branch -D patching git branch -D patching
false exit 1
) fi
fi done
git branch -M patched git branch -M patched
done done