Merge pull request #628 from dscho/restore-astextplain-passthrough

Restore astextplain passthrough

Author: dscho

git-extra/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.663.1dcfb5e44
+pkgver=1.1.667.036188a82
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -20,9 +20,11 @@ pkgver() {
   cd "$startdir"
   test ! -f "$(git rev-parse --git-path shallow)" || git -c http.sslbackend fetch --unshallow
   rev="$(git rev-list -1 HEAD -- . ':(exclude)./git-extra.install')"
-  test -n "$(git show . ':(exclude)./git-extra.install' |
-    sed -n -e '1,/^@@/d' -e '/^[-+]pkgver=/d' -e '/^[-+]pkgver=/d' -e "/^[-+] *'[0-9a-f]\{64\}'$/d" -e '/^[-+]/p')" ||
-  rev="$(git rev-list -1 $rev^ -- .)"
+  while test -z "$(git show $rev . ':(exclude)./git-extra.install' |
+    sed -n -e '1,/^@@/d' -e '/^[-+]pkgver=/d' -e '/^[-+]pkgver=/d' -e "/^[-+] *'[0-9a-f]\{64\}'$/d" -e '/^[-+]/p')"
+  do
+    rev="$(git rev-list -1 $rev^ -- .)"
+  done
   printf "%s.%s.%s" "${_ver_base}" "$(git rev-list --count $rev -- .)" \
     "$(git rev-parse --short=9 $rev)"
 }
@@ -79,7 +81,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             'dcbd1b981d5b899afe30151a5f5a27ea52025ff1335f131af1b5891f62ddd55b'
             '683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
             '1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
-            '2ad7292f8ea4aa7d027221bff2a987ad8e7c72a6866a5f14ea67f6187e850244'
+            '32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
             '1f83355ec7be0f11239b68d3b9d4d04534b347212a9eac4335397875a13514ef'
             '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
             '38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'

git-extra/astextplain

@@ -21,7 +21,7 @@ case "$(file --brief --mime-type "$1")" in
 		out=$(pdftotext -q -layout -enc UTF-8 "$1" -) && sed "s/(\^M$)|(^\^L)//" <<<$out || cat "$1"
 		;;
 	# TODO add rtf support
-	application/rtf | text/rtf)
+	application/rtf | text/rtf | text/plain)
 		cat "$1"
 		;;
 	*)