CatMC-Network
/
PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make apply patches target HEAD of upstream and squelch some fluff on applying.

This commit is contained in:
Aikar 2013-01-19 14:04:56 -05:00 committed by md_5
parent 4df099d776
commit efa13af283
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
applyPatches.sh
View File

@ -6,17 +6,20 @@ echo "Rebuilding Forked projects.... "
function applyPatch { function applyPatch {
what=$1 what=$1
target=$2 target=$2
cd $basedir/$what
git branch -f upstream >/dev/null
cd $basedir cd $basedir
if [ ! -d "$basedir/$target" ]; then if [ ! -d "$basedir/$target" ]; then
git clone $1 $target git clone $1 $target -b upstream
fi fi
cd "$basedir/$target" cd "$basedir/$target"
echo "Resetting $target to $what..." echo "Resetting $target to $what..."
git remote rm upstream 2>/dev/null git remote rm upstream 2>/dev/null 2>&1
git remote add upstream ../$what git remote add upstream ../$what >/dev/null 2>&1
git checkout master git checkout master >/dev/null 2>&1
git fetch upstream git fetch upstream >/dev/null 2>&1
git reset --hard upstream/master git reset --hard upstream/upstream
echo " Applying patches to $target..." echo " Applying patches to $target..."
git am --3way $basedir/${what}-Patches/*.patch git am --3way $basedir/${what}-Patches/*.patch
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then