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

Add support for old git version without -C

Browse Source
This commit is contained in:
Matthias Schiffer 2013-12-31 17:03:39 +01:00
parent 25db7bce77
commit 9274724486
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/patch.sh
View File

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

4
scripts/unpatch.sh
View File

@ -5,6 +5,6 @@ set -e
. "$1"/modules
for module in $GLUON_MODULES; do
dir="$1"/$module
git -C "$dir" checkout base
cd "$1"/$module
git checkout base
done

7
scripts/update-patches.sh
View File

@ -6,13 +6,14 @@ shopt -s nullglob
. "$1"/modules
for module in $GLUON_MODULES; do
dir="$1"/$module
rm -f "$1"/patches/$module/*.patch
mkdir -p "$1"/patches/$module
cd "$1"/$module
n=0
for commit in $(git -C "$dir" rev-list --reverse --no-merges base..patched); do
for commit in $(git rev-list --reverse --no-merges base..patched); do
let n=n+1
git -C "$dir" show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' $commit > "$1"/patches/$module/"$(printf '%04u' $n)-$(git -C "$dir" show -s --pretty=format:%f $commit).patch"
git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' $commit > "$1"/patches/$module/"$(printf '%04u' $n)-$(git show -s --pretty=format:%f $commit).patch"
done
done

11
scripts/update.sh
View File

@ -5,13 +5,14 @@ set -e
. "$1"/modules
for module in $GLUON_MODULES; do
dir="$1"/$module
mkdir -p "$dir"
var=$(echo $module | tr '[:lower:]/' '[:upper:]_')
eval repo=\${MODULE_${var}_REPO}
eval commit=\${MODULE_${var}_COMMIT}
git -C "$dir" init
git -C "$dir" checkout $commit 2>/dev/null || git -C "$dir" fetch $repo
git -C "$dir" checkout -B base $commit
mkdir -p "$1"/$module
cd "$1"/$module
git init
git checkout $commit 2>/dev/null || fetch $repo
git checkout -B base $commit
done