Merge pull request #648 from git-for-windows/drop-git-flow

Drop `git flow`

Author: dscho

ReleaseNotes.md

@@ -41,11 +41,14 @@ Git for Windows is distributed with other components yet, such as Bash, zlib, cu
 
 Due to persistent maintenance challenges and the community's limited engagement and usage, `git svn` support in Git for Windows will be [dropped from the next major Git for Windows release](https://github.com/git-for-windows/git/issues/5405).
 
+Note that `git flow` is no longer shipped with Git for Windows, after a version had been distributed that had been languishing for years. Even the original, years-stale Git Flow project [has been archived](https://github.com/nvie/gitflow/issues/3#issuecomment-3400894835).
+
 ### New Features
 
 * Comes with [OpenSSL v3.5.4](https://www.openssl.org/news/openssl-3.5-notes.html).
 * Comes with the MSYS2 runtime (Git for Windows flavor) based on [Cygwin v3.6.5](https://inbox.sourceware.org/cygwin-announce/d0ea504c-d683-4ed6-a47e-e866ddd37613@dronecode.org.uk/).
 * Comes with [OpenSSH v10.2.P1](https://github.com/openssh/openssh-portable/releases/tag/V_10_2_P1).
+* Drops `git flow`.
 
 ### Bug Fixes
 

git-extra/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.672.64870a8db
+pkgver=1.1.674.3bd5106ab
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -82,7 +82,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             '683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
             '1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
             '32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
-            '7436438b8db90ce4b79402a5383a688fa95831167b38f9f918f438ade199a44d'
+            'b3393a6197ee920d27a646b59c5bdafff15da31772fff59bc9f8fbc9f5d358cb'
             '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
             '8120b41b869693e07acc4707a0ab45505e7c5e4156a3a44b19152f1f425df85f'
             '15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'

git-extra/git-sdk.sh

@@ -127,7 +127,6 @@ sdk () {
 			bash \
 			curl \
 			gawk \
-			git-flow \
 			gnupg \
 			heimdal \
 			mintty \

make-file-list.sh

@@ -160,7 +160,7 @@ LIBCURL_EXTRA=
 required=
 for req in mingw-w64-$PACMAN_ARCH-git-credential-manager $SH_FOR_REBASE $LIBCURL_EXTRA \
 	$(test -n "$MINIMAL_GIT" || echo \
-		mingw-w64-$PACMAN_ARCH-connect git-flow unzip docx2txt \
+		mingw-w64-$PACMAN_ARCH-connect unzip docx2txt \
 		mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt \
 		mingw-w64-$PACMAN_ARCH-xpdf-tools ssh-pageant mingw-w64-$PACMAN_ARCH-git-lfs \
 		tig nano perl-JSON libpcre2_8 libpcre2posix $GIT_UPDATE_EXTRA_PACKAGES)
@@ -183,7 +183,7 @@ if test -z "$MINIMAL_GIT"
 then
 	packages="$packages mingw-w64-$PACMAN_ARCH-git-doc-html ncurses mintty vim nano
 		winpty less gnupg tar diffutils patch dos2unix which subversion perl-JSON
-		mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect git-flow docx2txt
+		mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect docx2txt
 		mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant
 		mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"
 fi