Skip to content

Restore astextplain passthrough #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 23, 2025
Merged

Restore astextplain passthrough #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
769f31b
astextplain: restore passthrough for plaintext DOC/DOT files
ClaudioHoffmann Jun 21, 2025
d90bdff
Merge branch 'main' of git-for-windows/build-extra into HEAD
dscho Jun 23, 2025
036188a
git-extra: fix the `pkgver` logic again
dscho Jun 23, 2025
0b5e63e
git-extra: update checksums
dscho Jun 23, 2025
ea851d9
git-extra: update pkgver
dscho Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions git-extra/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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)"
}
Expand Down Expand Up @@ -79,7 +81,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
'dcbd1b981d5b899afe30151a5f5a27ea52025ff1335f131af1b5891f62ddd55b'
'683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
'1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
'2ad7292f8ea4aa7d027221bff2a987ad8e7c72a6866a5f14ea67f6187e850244'
'32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
'1f83355ec7be0f11239b68d3b9d4d04534b347212a9eac4335397875a13514ef'
'22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
'38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'
Expand Down
2 changes: 1 addition & 1 deletion git-extra/astextplain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
*)
Expand Down