From 78792a81167d34a45bb8629d87b276a6e930d3de Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 31 Aug 2015 08:55:55 +0300 Subject: [PATCH] Include the patch package patch is used by users in tools and scripts, and it generally useful to have. The added package increases the installer size by 54K. --- installer/ReleaseNotes.md | 1 + make-file-list.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/ReleaseNotes.md b/installer/ReleaseNotes.md index 97870a241f..41f2fb271c 100644 --- a/installer/ReleaseNotes.md +++ b/installer/ReleaseNotes.md @@ -45,6 +45,7 @@ This package contains software from a number of other projects including Bash, z * `call start-ssh-agent` [no longer spits out bogus lines](https://github.com/git-for-windows/git/issues/314). * It is now possible [even behind NTLM-authenticated proxies](https://github.com/git-for-windows/git/issues/309) to install [Git for Windows' SDK](https://git-for-windows.github.io/#download-sdk). * We [can handle the situation now](https://github.com/git-for-windows/git/issues/318) when the first `$PATH` elements point outside of Git for Windows' `bin/` directories and contain `.dll` files that interfere with our own (e.g. PostgreSQL's `libintl-8.dll`). +* The patch package, which was included in msysgit but [not in Git for Windows](https://github.com/git-for-windows/git/issues/221) is now included. ##Changes since Git-2.4.6 (July 18th 2015) diff --git a/make-file-list.sh b/make-file-list.sh index 8a1c9ccb8d..809dcda691 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -32,7 +32,7 @@ die "Could not install required packages" pacman_list mingw-w64-$ARCH-git mingw-w64-$ARCH-git-doc-html \ git-extra ncurses mintty vim openssh winpty \ - sed awk less grep gnupg tar findutils coreutils diffutils \ + sed awk less grep gnupg tar findutils coreutils diffutils patch \ dos2unix which subversion mingw-w64-$ARCH-tk \ mingw-w64-$ARCH-connect "$@" | grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \