Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

git: update to 3.36.0 & rebase patches & use CYGWIN_CHOST

Browse Source 
Removes git-1.9.0-manifest-msys2.patch as it is already applied upstream
as fe90397604f9f9695b3fa0b8b11d9f93533b655f

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
This commit is contained in:
Christopher Degawa
2022-04-28 19:19:02 -05:00
parent 37453b4f7c
commit 2ccaf50d3e
8 changed files with 60 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
git/git-1.8.4-msys2.patch
View File

@@ -1,7 +1,7 @@
--- git-1.8.4/config.mak.uname 2013-08-23 23:38:43.000000000 +0400
+++ git-1.8.4m/config.mak.uname 2013-08-25 21:04:59.876953200 +0400
@@ -174,6 +174,31 @@
COMPAT_OBJS += compat/cygwin.o
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -244,6 +244,31 @@ ifeq ($(uname_O),Cygwin)
COMPAT_OBJS += compat/win32/path-utils.o
FREAD_READS_DIRECTORIES = UnfortunatelyYes
endif
+ifeq ($(uname_O),Msys)
@@ -31,27 +31,14 @@
+endif
ifeq ($(uname_S),FreeBSD)
NEEDS_LIBICONV = YesPlease
OLD_ICONV = YesPlease
diff -Naur git-1.8.3.1/contrib/completion/git-completion.bash git-1.8.3.1m/contrib/completion/git-completion.bash
--- git-1.8.4/contrib/completion/git-completion.bash 2013-06-10 20:01:55.000000000 +0000
+++ git-1.8.4m/contrib/completion/git-completion.bash 2013-06-13 11:35:14.541992200 +0000
@@ -2760,3 +2760,7 @@
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
__git_complete git.exe __git_main
# Versions up to 10.1 require OLD_ICONV; 10.2 and beyond don't.
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3589,3 +3589,7 @@ ___git_complete gitk __gitk_main
if [ "$OSTYPE" = cygwin ]; then
___git_complete git.exe __git_main
fi
+
+if [ Msys = "$(uname -o 2>/dev/null)" ]; then
+__git_complete git.exe __git_main
+if [ "$OSTYPE" = msys ]; then
+ ___git_complete git.exe __git_main
+fi
diff -Naur git-1.8.3.1/t/test-lib.sh git-1.8.3.1m/t/test-lib.sh
--- git-1.8.4/t/test-lib.sh 2013-06-10 20:01:55.000000000 +0000
+++ git-1.8.4m/t/test-lib.sh 2013-06-13 11:35:14.557617200 +0000
@@ -677,7 +677,7 @@
test_set_prereq NOT_CYGWIN
test_set_prereq SED_STRIPS_CR
;;
-*CYGWIN*)
+*CYGWIN* | *MSYS*)
test_set_prereq POSIXPERM
test_set_prereq EXECKEEPSPID
test_set_prereq NOT_MINGW