diff --git a/git/0001-msys2-Use-a-copy-of-has_dos_drive_prefix-logic.patch b/git/0001-msys2-Use-a-copy-of-has_dos_drive_prefix-logic.patch new file mode 100644 index 00000000..51077f69 --- /dev/null +++ b/git/0001-msys2-Use-a-copy-of-has_dos_drive_prefix-logic.patch @@ -0,0 +1,29 @@ +From 6a2f2505379985d934dfb31a5fbca10a2dfef46e Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sun, 21 Feb 2016 16:33:22 +0000 +Subject: [PATCH] msys2: Use a copy of has_dos_drive_prefix logic + +in git_has_dos_drive_prefix +--- + git-compat-util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/git-compat-util.h b/git-compat-util.h +index 693a336..4aaa1e6 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -332,7 +332,11 @@ extern char *gitdirname(char *); + #ifndef has_dos_drive_prefix + static inline int git_has_dos_drive_prefix(const char *path) + { ++#if defined(__MSYS__) ++ return (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0); ++#else + return 0; ++#endif + } + #define has_dos_drive_prefix git_has_dos_drive_prefix + #endif +-- +2.7.0 + diff --git a/git/PKGBUILD b/git/PKGBUILD index 1e37f589..b410b426 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: Alexey Pavlov +# Contributor: Ray Donnelly pkgname=git -pkgver=2.7.0 +pkgver=2.7.1 pkgrel=1 pkgdesc="The fast distributed version control system" arch=('i686' 'x86_64') @@ -46,21 +47,24 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg 1.7.9-cygwin.patch git-1.9.0-manifest-msys2.patch git-1.8.4-msys2.patch - git-2.3.5-mingw-pwd.patch) -md5sums=('f685d9a1788ad46c8d3ef7ca8f1fcf5f' - 'c33c9dfa2944a0de9151a7af7a63a27b' - 'b45a125ce8690fbba4097ee082c7d5b7' - '9f9170a30dfb7643df4948cdae5bb864' - '18381075d8c134d8c4b03c9a566f40f0') + git-2.3.5-mingw-pwd.patch + 0001-msys2-Use-a-copy-of-has_dos_drive_prefix-logic.patch) +sha1sums=('78126643bc50c4eb74fa890b484a3db8d288e9c8' + 'f56f09730fdd42993a4c2a3f8ec9d9a92403de62' + 'd2811096c317c663cdc4cc7ebb82399e665f9d1e' + 'ee09010bd11f870a094f329273482212e5e6a57e' + 'ed864985270646f4a8b38d0678714bd020b24401' + 'e92024d625026b0278718929fa0da762bd022113') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" rm -f compat/win32/git.manifest compat/win32/resource.rc - patch -p2 -i ${srcdir}/1.7.9-cygwin.patch - patch -p1 -i ${srcdir}/git-1.9.0-manifest-msys2.patch - patch -p1 -i ${srcdir}/git-1.8.4-msys2.patch - patch -p2 -i ${srcdir}/git-2.3.5-mingw-pwd.patch + patch -p2 -i "${srcdir}"/1.7.9-cygwin.patch + patch -p1 -i "${srcdir}"/git-1.9.0-manifest-msys2.patch + patch -p1 -i "${srcdir}"/git-1.8.4-msys2.patch + patch -p2 -i "${srcdir}"/git-2.3.5-mingw-pwd.patch + patch -p1 -i "${srcdir}"/0001-msys2-Use-a-copy-of-has_dos_drive_prefix-logic.patch local _arch= if [ "${CARCH}" == 'x86_64' ]; then