62 lines
1.8 KiB
Bash
62 lines
1.8 KiB
Bash
|
#!/usr/bin/env bash
|
||
|
|
|
||
|
|
(
|
||
|
|
PS1="$"
|
||
|
|
basedir="$(cd "$1" && pwd -P)"
|
||
|
|
workdir="$basedir/work"
|
||
|
|
echo "Rebuilding patch files from current fork state..."
|
||
|
|
git config core.safecrlf false
|
||
|
|
|
||
|
|
function cleanupPatches {
|
||
|
|
cd "$1"
|
||
|
|
for patch in *.patch; do
|
||
|
|
echo "$patch"
|
||
|
|
gitver=$(tail -n 2 "$patch" | grep -ve "^$" | tail -n 1)
|
||
|
|
diffs=$(git diff --staged "$patch" | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
|
||
|
|
|
||
|
|
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
|
||
|
|
if [ "x$testver" != "x" ]; then
|
||
|
|
diffs=$(echo "$diffs" | sed 'N;$!P;$!D;$d')
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ "x$diffs" == "x" ] ; then
|
||
|
|
git reset HEAD "$patch" >/dev/null
|
||
|
|
git checkout -- "$patch" >/dev/null
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
}
|
||
|
|
|
||
|
|
function savePatches {
|
||
|
|
what=$1
|
||
|
|
what_name=$(basename "$what")
|
||
|
|
target=$2
|
||
|
|
echo "Formatting patches for $what..."
|
||
|
|
|
||
|
|
cd "$basedir/${what_name}-Patches/"
|
||
|
|
if [ -d "$basedir/$target/.git/rebase-apply" ]; then
|
||
|
|
# in middle of a rebase, be smarter
|
||
|
|
echo "REBASE DETECTED - PARTIAL SAVE"
|
||
|
|
last=$(cat "$basedir/$target/.git/rebase-apply/last")
|
||
|
|
next=$(cat "$basedir/$target/.git/rebase-apply/next")
|
||
|
|
for i in $(seq -f "%04g" 1 1 $last)
|
||
|
|
do
|
||
|
|
if [ $i -lt $next ]; then
|
||
|
|
rm ${i}-*.patch
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
else
|
||
|
|
rm -rf *.patch
|
||
|
|
fi
|
||
|
|
|
||
|
|
cd "$basedir/$target"
|
||
|
|
|
||
|
|
git format-patch --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null
|
||
|
|
cd "$basedir"
|
||
|
|
git add -A "$basedir/${what_name}-Patches"
|
||
|
|
cleanupPatches "$basedir/${what_name}-Patches"
|
||
|
|
echo " Patches saved for $what to $what_name-Patches/"
|
||
|
|
}
|
||
|
|
|
||
|
|
savePatches "Waterfall/Waterfall-Proxy" "Travertine-Proxy"
|
||
|
|
)
|