mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 06:25:15 +01:00
Update rebuildPatches to ignore git version string.
This commit is contained in:
parent
17af62c898
commit
41b7c5f465
1 changed files with 10 additions and 2 deletions
|
@ -5,8 +5,16 @@ echo "Rebuilding patch files from current fork state..."
|
|||
function cleanupPatches {
|
||||
cd $1
|
||||
for patch in *.patch; do
|
||||
lines=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)" | wc -l)
|
||||
if [ "$lines" == "0" ] ; then
|
||||
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" | head -n -2)
|
||||
fi
|
||||
|
||||
|
||||
if [ "x$diffs" == "x" ] ; then
|
||||
git reset HEAD $patch >/dev/null
|
||||
git checkout -- $patch >/dev/null
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue