diff --git a/git/PKGBUILD b/git/PKGBUILD index 9e84310b..4cfde4a9 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -3,7 +3,7 @@ pkgname=git pkgver=2.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="The fast distributed version control system" arch=('i686' 'x86_64') url="https://git-scm.com/" @@ -55,7 +55,7 @@ sha256sums=('e08503ecaf5d3ac10c40f22871c996a392256c8d038d16f52ebf974cba29ae42' 'deb39583002770bdfb3d612562e9db73cd6fbd6cc6639fc5d3aeeae25e54ebcc' 'a82df3fc9a80b9f9003a9b9feca063413b14630c043c0b2b88bf2c61c46154cc' 'f67412f829e026b677d4c3ceacfb21da0549ad4636fb07c283e52c3fd5aa3e22' - 'ae5a2457b51ecdb6b5844c67c0ac402fe99847fed5402975df7330beec355951') + 'fb405b47c5de08ba73082db959222f5ec87568794e002533cc0b1dcb7edad3d4') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -65,7 +65,7 @@ prepare() { 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}"/git-2.8.1-Cygwin-Allow-DOS-paths.patch + #patch -p1 -i "${srcdir}"/git-2.8.1-Cygwin-Allow-DOS-paths.patch local _arch= if [ "${CARCH}" == 'x86_64' ]; then diff --git a/git/git-2.8.1-Cygwin-Allow-DOS-paths.patch b/git/git-2.8.1-Cygwin-Allow-DOS-paths.patch index 9d6fe9d9..b2b5ac7d 100644 --- a/git/git-2.8.1-Cygwin-Allow-DOS-paths.patch +++ b/git/git-2.8.1-Cygwin-Allow-DOS-paths.patch @@ -26,7 +26,7 @@ } +/* -+ * Always duplicates `path` even if no conversion was performed. ++ * Avoids duplicating `path` if not needed unless `always_dupe` is non-zero. + */ +char *maybe_xstrdup_cyg_conv_path(const char *path, int always_dupe) +{