fix(common-files/building-system-patches): update version check workaround

- Better way that matches what will be upstreamed

Author: robertkirkman

common-files/building-system-patches/0009-allow-lint-packages-version-check.patch

@@ -1,15 +1,27 @@
-'git reset HEAD~' is TEMPORARY - work around bug in lint-packages.sh
-will discuss with Tomjo2000 and fix upstream later
+Part of this will be rebased after
+https://github.com/termux/termux-packages/pull/27095
 
 --- a/scripts/lint-packages.sh
 +++ b/scripts/lint-packages.sh
-@@ -124,7 +124,8 @@ check_indentation() {
+@@ -123,9 +123,9 @@ check_indentation() {
+ 
  # We'll need the 'origin/master' as a base commit when running the version check.
  # So try fetching it now if it doesn't exist.
-+git reset HEAD~
- if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then
+-if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then
 -	git fetch https://github.com/termux/termux-packages.git
+-	base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"
++if ! base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)"; then
 +	git fetch https://github.com/termux-user-repository/tur.git
- 	base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"
++	base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)"
  fi
 
+ check_version() {
+@@ -155,7 +155,7 @@ check_version() {
+ 		}
+ 
+ 		# Was the package modified in this branch?
+-		git diff --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && {
++		git diff --no-merges --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && {
+ 			printf '%s\n' "PASS - ${version} (not modified in this branch)"
+ 			continue
+ 		}