Skip to content

Really accommodate for pc-msys -> pc-cygwin change #629

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 2 commits into from
Jul 10, 2025
Merged

Really accommodate for pc-msys -> pc-cygwin change #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09847e0
git-sdk.sh: really accommodate for the recent `pc-msys` -> `pc-cygwin…
dscho Jun 25, 2025
571131e
git-extra: bump version
dscho Jun 25, 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
4 changes: 2 additions & 2 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.667.036188a82
pkgver=1.1.670.09847e01e
pkgrel=1
pkgdesc="Git for Windows extra files"
arch=('any')
Expand Down Expand Up @@ -82,7 +82,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
'683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
'1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
'32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
'1f83355ec7be0f11239b68d3b9d4d04534b347212a9eac4335397875a13514ef'
'7436438b8db90ce4b79402a5383a688fa95831167b38f9f918f438ade199a44d'
'22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
'38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'
'15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'
Expand Down
6 changes: 3 additions & 3 deletions git-extra/git-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ sdk () {
git diff-index --quiet HEAD ||
test ! -s .git/index ||
(uname_m="$(uname -m)" &&
test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin" &&
test ! -d "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin" &&
test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"); }
then
# no local changes
Expand All @@ -371,9 +371,9 @@ sdk () {

# Build the current branch
(uname_m="$(uname -m)" &&
if test -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
if test -d "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin"
then
cd "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
cd "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin"
else
cd "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"
fi &&
Expand Down