From fa72a716018dfeb46093ac4aabccc79a1fde7ec5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Oct 2018 22:36:03 -0400 Subject: [PATCH] Remove useless hashes from patches This avoids annoying conflicts as well as gets rid of diff noise from clients preferring different hash lengths --- scripts/rebuildPatches.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index 49d347d53f..f98ee8d09f 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -12,9 +12,11 @@ echo "Rebuilding patch files from current fork state..." function cleanupPatches { cd "$1" for patch in *.patch; do - echo "$patch" + sed -ri 's/index [a-f0-9]+\.\.[a-f0-9]+/index 7ac07ac07ac0..7ac07ac07ac0/g' "$patch" + sed -ri 's/^From [a-f0-9]{32,}/From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0/g' "$patch" + $gitcmd add -A $patch gitver=$(tail -n 2 "$patch" | grep -ve "^$" | tail -n 1) - diffs=$($gitcmd diff --staged "$patch" | grep --color=none -E "^(\+|\-)" | grep --color=none -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|^.index)") + diffs=$($gitcmd diff --staged "$patch" | grep --color=none -E "^(\+|\-)" | grep --color=none -Ev "(From [a-f0-9]{32,}|\-\-\- a|\+\+\+ b|^.index)") testver=$(echo "$diffs" | tail -n 2 | grep --color=none -ve "^$" | tail -n 1 | grep --color=none "$gitver") if [ "x$testver" != "x" ]; then