From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sun, 19 Apr 2020 02:06:34 +0000 (+0000)
Subject: Maintenance: Move sort-includes.pl to scripts/maintenance/ (#599)
X-Git-Tag: 4.15-20210522-snapshot~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=785b6816bdfcd2783e19cbb0f0c761526c7cbd2a;p=thirdparty%2Fsquid.git

Maintenance: Move sort-includes.pl to scripts/maintenance/ (#599)

We will no longer get `changed #include order` notices but will get
`changed: by maintenance/sort-includes.pl` notices, including for
whitespace-only changes.
---

diff --git a/scripts/sort-includes.pl b/scripts/maintenance/sort-includes.pl
similarity index 100%
rename from scripts/sort-includes.pl
rename to scripts/maintenance/sort-includes.pl
diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 872857ee77..4da788ee97 100755
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -159,17 +159,6 @@ for FILENAME in `git ls-files`; do
         	fi
 	fi
 
-	./scripts/sort-includes.pl ${FILENAME} >${FILENAME}.sorted
-	if test -e ${FILENAME} -a -e "${FILENAME}.sorted"; then
-		md51=`cat  ${FILENAME}| tr -d "\n \t\r" | $MD5`;
-		md52=`cat  ${FILENAME}.sorted| tr -d "\n \t\r" | $MD5`;
-
-		if test "$md51" != "$md52" ; then
-			echo "NOTICE: File ${FILENAME} changed #include order"
-		fi
-		mv ${FILENAME}.sorted ${FILENAME}
-	fi
-
 	#
 	# REQUIRE squid.h first #include
 	#