Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
Update rebuildPatches to ignore git version string.
Dieser Commit ist enthalten in:
Ursprung
17af62c898
Commit
41b7c5f465
@ -5,8 +5,16 @@ echo "Rebuilding patch files from current fork state..."
|
|||||||
function cleanupPatches {
|
function cleanupPatches {
|
||||||
cd $1
|
cd $1
|
||||||
for patch in *.patch; do
|
for patch in *.patch; do
|
||||||
lines=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)" | wc -l)
|
gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
|
||||||
if [ "$lines" == "0" ] ; then
|
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 reset HEAD $patch >/dev/null
|
||||||
git checkout -- $patch >/dev/null
|
git checkout -- $patch >/dev/null
|
||||||
fi
|
fi
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren