{"thread":{"id":"58901","subject":"[PATCH 0/2] Remove MSys Support","startedAt":"2022-12-05T21:04:51Z","lastAt":"2023-02-02T16:06:51Z","messageCount":16,"participants":["Harshil Jani via GitGitGadget","Harshil-Jani via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"468545","messageId":"pull.1433.git.1670274213.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":null,"subject":"[PATCH 0/2] Remove MSys Support","fromName":"Harshil Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-12-05T21:03:31Z","receivedAt":"2022-12-05T21:04:51Z","isPatch":true,"sender":{"key":"name:Harshil Jani","avatar":null},"body":"I am trying to learn more about the git code base and came across the issue\nwhere the support of MSys environment was to be dropped. This patch is my\nfirst contribution towards it.\n\nThe msysGit and the MSys v1.x has been dropped into this patch and the\nUSE_NED_ALLOCATOR variable was duplicated here in the implementation so its\ndeduplication was also made in this patch.\n\nSigned-off-by: Harshil-Jani harshiljani2002@gmail.com\n\nHarshil-Jani (2):\n mingw: remove duplicate `USE_NED_ALLOCATOR` directive\n mingw: remove msysGit/MSYS1 support\n\n config.mak.uname | 86 ++++++++++++++++++++----------------------------\n 1 file changed, 35 insertions(+), 51 deletions(-)\n\n\nbase-commit: 35a62bb5798092d491e6c7e688db6cb1418c9098\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1433%2FHarshil-Jani%2Fdrop-Msys-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1433/Harshil-Jani/drop-Msys-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1433\n-- \ngitgitgadget\n"},{"id":"468546","messageId":"bc79dfcc4d44e0f006dc64d75a2c7f8a11834229.1670274213.git.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":"pull.1433.git.1670274213.gitgitgadget@gmail.com","subject":"[PATCH 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive","fromName":"Harshil-Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-12-05T21:03:32Z","receivedAt":"2022-12-05T21:04:52Z","isPatch":true,"sender":{"key":"name:Harshil-Jani","avatar":null},"body":"From: Harshil-Jani \n\nnedalloc was added to fix the slowness of memory allocator. Here\nspecifically for the MSys2 build there seems to be a duplication of\nUSE_NED_ALLOCATOR directive. So this patch intends to remove the\nduplicate USE_NED_ALLOCATOR and keeping it only into the MSys2 config\nsection so it still uses the nedalloc.\n\nSigned-off-by: Harshil-Jani \n---\n config.mak.uname | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex d63629fe807..377667c4bbc 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -652,7 +652,6 @@ ifeq ($(uname_S),MINGW)\n \tUSE_WIN32_IPC = YesPlease\n \tUSE_WIN32_MMAP = YesPlease\n \tMMAP_PREVENTS_DELETE = UnfortunatelyYes\n-\tUSE_NED_ALLOCATOR = YesPlease\n \tUNRELIABLE_FSTAT = UnfortunatelyYes\n \tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n \tNO_REGEX = YesPlease\n-- \ngitgitgadget\n\n"},{"id":"468547","messageId":"e6d3d280a4f9216aa6e9c3c83a38b0fb8ba3a8a1.1670274213.git.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":"pull.1433.git.1670274213.gitgitgadget@gmail.com","subject":"[PATCH 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Harshil-Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-12-05T21:03:33Z","receivedAt":"2022-12-05T21:04:55Z","isPatch":true,"sender":{"key":"name:Harshil-Jani","avatar":null},"body":"From: Harshil-Jani \n\nThe msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\nlast known user for MSys1 + MinGW has switched to MSys2. So there was no\nreason to keep the msysGit/MSys1 config section. This Patch intends to\nremove the support of both the builds and throw an error on\nexecution.\n\nThe output of `uname -r` if returns us with '1.' then it relates with MSys1\nbuild environment and msysGit which we don't want to continue ahead and thus\nan error can be expected.\n\nThe MSYS2 is currently used into the MinGW so we can get that part\nrunning directly without any conditionals required.\n\nSigned-off-by: Harshil-Jani \n---\n config.mak.uname | 85 ++++++++++++++++++++----------------------------\n 1 file changed, 35 insertions(+), 50 deletions(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 377667c4bbc..965ec530837 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -623,6 +623,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n \tSHELL_PATH = /usr/coreutils/bin/bash\n endif\n ifeq ($(uname_S),MINGW)\n+\tifeq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n+\t\t$(error \"Building with MSys is no longer supported\")\n+\tendif\n \tpathsep = ;\n \tHAVE_ALLOCA_H = YesPlease\n \tNO_PREAD = YesPlease\n@@ -676,61 +679,43 @@ ifeq ($(uname_S),MINGW)\n \tRC = windres -O coff\n \tNATIVE_CRLF = YesPlease\n \tX = .exe\n-ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n-\thtmldir = doc/git/html/\n-\tprefix =\n+\t# MSys2\n+\tprefix = /usr/\n+\t# Enable DEP\n+\tBASIC_LDFLAGS += -Wl,--nxcompat\n+\t# Enable ASLR (unless debugging)\n+\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n+\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n+\tendif\n+\tifeq (MINGW32,$(MSYSTEM))\n+\t\tprefix = /mingw32\n+\t\tHOST_CPU = i686\n+\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n+\tendif\n+\tifeq (MINGW64,$(MSYSTEM))\n+\t\tprefix = /mingw64\n+\t\tHOST_CPU = x86_64\n+\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n+\telse\n+\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n+\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n+\tendif\n+\tCC = gcc\n+\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n+\t\t-fstack-protector-strong\n+\tEXTLIBS += -lntdll\n \tINSTALL = /bin/install\n-\tEXTLIBS += /mingw/lib/libz.a\n \tINTERNAL_QSORT = YesPlease\n \tHAVE_LIBCHARSET_H = YesPlease\n-\tNO_GETTEXT = YesPlease\n-\tNO_PYTHON = YesPlease\n-\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS\n-else\n-\tifneq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n-\t\t# MSys2\n-\t\tprefix = /usr/\n-\t\t# Enable DEP\n-\t\tBASIC_LDFLAGS += -Wl,--nxcompat\n-\t\t# Enable ASLR (unless debugging)\n-\t\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n-\t\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n-\t\tendif\n-\t\tifeq (MINGW32,$(MSYSTEM))\n-\t\t\tprefix = /mingw32\n-\t\t\tHOST_CPU = i686\n-\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n-\t\tendif\n-\t\tifeq (MINGW64,$(MSYSTEM))\n-\t\t\tprefix = /mingw64\n-\t\t\tHOST_CPU = x86_64\n-\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n-\t\telse\n-\t\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n-\t\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n-\t\tendif\n-\t\tCC = gcc\n-\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n-\t\t\t-fstack-protector-strong\n-\t\tEXTLIBS += -lntdll\n-\t\tINSTALL = /bin/install\n-\t\tINTERNAL_QSORT = YesPlease\n-\t\tHAVE_LIBCHARSET_H = YesPlease\n-\t\tUSE_GETTEXT_SCHEME = fallthrough\n-\t\tUSE_LIBPCRE = YesPlease\n-\t\tUSE_NED_ALLOCATOR = YesPlease\n-\t\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n-\t\t\t# Move system config into top-level /etc/\n-\t\t\tETC_GITCONFIG = ../etc/gitconfig\n-\t\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n-\t\tendif\n-\telse\n-\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO\n-\t\tNO_CURL = YesPlease\n-\t\tNO_PYTHON = YesPlease\n+\tUSE_GETTEXT_SCHEME = fallthrough\n+\tUSE_LIBPCRE = YesPlease\n+\tUSE_NED_ALLOCATOR = YesPlease\n+\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n+\t\t# Move system config into top-level /etc/\n+\t\tETC_GITCONFIG = ../etc/gitconfig\n+\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n \tendif\n endif\n-endif\n ifeq ($(uname_S),QNX)\n \tCOMPAT_CFLAGS += -DSA_RESTART=0\n \tEXPAT_NEEDS_XMLPARSE_H = YesPlease\n-- \ngitgitgadget\n"},{"id":"469238","messageId":"xmqq1qoxzdam.fsf@gitster.g","threadId":"58901","inReplyTo":"bc79dfcc4d44e0f006dc64d75a2c7f8a11834229.1670274213.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-12-18T01:54:57Z","receivedAt":"2022-12-18T01:55:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Harshil-Jani via GitGitGadget\" writes:\n\n> From: Harshil-Jani \n>\n> nedalloc was added to fix the slowness of memory allocator. Here\n> specifically for the MSys2 build there seems to be a duplication of\n> USE_NED_ALLOCATOR directive.\n\nYes, if your platform's \"uname -S\" says \"MINGW\", your build is done\nin a directory with ../THIS_IS_MSYSGIT marker file, and your \"uname -R\"\ndoes not begin with \"1.\", then there are two USE_NED_ALLOCATOR=YesPlease\nin effect.\n\n> So this patch intends to remove the\n> duplicate USE_NED_ALLOCATOR and keeping it only into the MSys2 config\n> section so it still uses the nedalloc.\n\nWhat about other folks whose \"uname -S\" says \"MINGW\"?\n\n> Signed-off-by: Harshil-Jani \n> ---\n> config.mak.uname | 1 -\n> 1 file changed, 1 deletion(-)\n>\n> diff --git a/config.mak.uname b/config.mak.uname\n> index d63629fe807..377667c4bbc 100644\n> --- a/config.mak.uname\n> +++ b/config.mak.uname\n> @@ -652,7 +652,6 @@ ifeq ($(uname_S),MINGW)\n> \tUSE_WIN32_IPC = YesPlease\n> \tUSE_WIN32_MMAP = YesPlease\n> \tMMAP_PREVENTS_DELETE = UnfortunatelyYes\n> -\tUSE_NED_ALLOCATOR = YesPlease\n> \tUNRELIABLE_FSTAT = UnfortunatelyYes\n> \tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n> \tNO_REGEX = YesPlease\n\nThe original in a wider context looks like this:\n\n ifeq ($(uname_S),MINGW)\n ...\n MMAP_PREVENTS_DELETE = UnfortunatelyYes\n USE_NED_ALLOCATOR = YesPlease\n UNRELIABLE_FSTAT = UnfortunatelyYes\n ...\n X = .exe\n ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n htmldir = doc/git/html/\n ...\n COMPAT_CFLAGS += -D__USE_MINGW_ACCESS\n else\n ifneq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n # MSys2\n ...\n USE_LIBPCRE = YesPlease\n USE_NED_ALLOCATOR = YesPlease\n ifeq (/mingw64,$(subst 32,64,$(prefix)))\n # Move system config into top-level /etc/\n ...\n endif\n else\n ...\n endif\n endif\n endif\n\nWith this patch, a build that has ../THIS_IS_MSYSGIT marker file, or\nwhose \"uname -R\" output begins with \"1.\", will no longer get\nUSE_NED_ALLOCATOR. Intended?\n\nWithout knowing much about the Windows/MSYS/Git for Windows SDK\necosystem, it is the inner one that looks duplicated, but the patch\nis removing the outer one that helps every platform whose \"uname -S\"\nidentifies it as MINGW.\n\nPerhaps that is what the patch meant to do, but then the proposed\nlog message explains it very differently. It only talks about the\nno-op case. It does not explain why other folks whose \"uname -S\"\nsays MINGW (1) are not broken if this patch suddenly robs NED\nallocator from them, and (2) are better off without using NED\nallocator.\n"},{"id":"469239","messageId":"xmqqsfhdxxyj.fsf@gitster.g","threadId":"58901","inReplyTo":"e6d3d280a4f9216aa6e9c3c83a38b0fb8ba3a8a1.1670274213.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-12-18T02:11:32Z","receivedAt":"2022-12-18T02:11:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Harshil-Jani via GitGitGadget\" writes:\n\n> From: Harshil-Jani \n>\n> The msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\n> last known user for MSys1 + MinGW has switched to MSys2.\n\nIt is curious that we can speak with such a certainty of the lack of\nusers of such a popular project. References?\n\n> So there was no\n> reason to keep the msysGit/MSys1 config section. This Patch intends to\n> remove the support of both the builds and throw an error on\n> execution.\n>\n> The output of `uname -r` if returns us with '1.' then it relates with MSys1\n> build environment and msysGit which we don't want to continue ahead and thus\n> an error can be expected.\n\nThe above clearly explains what is written in the patch text, but\nthe proposed log message does not explain what ../THIS_IS_MSYSGIT\nused to guard and why now we can remove it.\n\n> The MSYS2 is currently used into the MinGW so we can get that part\n> running directly without any conditionals required.\n>\n> Signed-off-by: Harshil-Jani \n> ---\n> config.mak.uname | 85 ++++++++++++++++++++----------------------------\n> 1 file changed, 35 insertions(+), 50 deletions(-)\n\nThanks. It always is good to see more lines go away ;-) but these\ntwo patches need to be explained a bit better and supported by folks\nwho have been active on Windows port of the project.\n\n> diff --git a/config.mak.uname b/config.mak.uname\n> index 377667c4bbc..965ec530837 100644\n> --- a/config.mak.uname\n> +++ b/config.mak.uname\n> @@ -623,6 +623,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n> \tSHELL_PATH = /usr/coreutils/bin/bash\n> endif\n> ifeq ($(uname_S),MINGW)\n> +\tifeq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n> +\t\t$(error \"Building with MSys is no longer supported\")\n> +\tendif\n> \tpathsep = ;\n> \tHAVE_ALLOCA_H = YesPlease\n> \tNO_PREAD = YesPlease\n> @@ -676,61 +679,43 @@ ifeq ($(uname_S),MINGW)\n> \tRC = windres -O coff\n> \tNATIVE_CRLF = YesPlease\n> \tX = .exe\n> -ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n> -\thtmldir = doc/git/html/\n> -\tprefix =\n> +\t# MSys2\n> +\tprefix = /usr/\n> +\t# Enable DEP\n> +\tBASIC_LDFLAGS += -Wl,--nxcompat\n> +\t# Enable ASLR (unless debugging)\n> +\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n> +\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n> +\tendif\n> +\tifeq (MINGW32,$(MSYSTEM))\n> +\t\tprefix = /mingw32\n> +\t\tHOST_CPU = i686\n> +\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n> +\tendif\n> +\tifeq (MINGW64,$(MSYSTEM))\n> +\t\tprefix = /mingw64\n> +\t\tHOST_CPU = x86_64\n> +\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n> +\telse\n> +\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n> +\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n> +\tendif\n> +\tCC = gcc\n> +\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n> +\t\t-fstack-protector-strong\n> +\tEXTLIBS += -lntdll\n> \tINSTALL = /bin/install\n> -\tEXTLIBS += /mingw/lib/libz.a\n> \tINTERNAL_QSORT = YesPlease\n> \tHAVE_LIBCHARSET_H = YesPlease\n> -\tNO_GETTEXT = YesPlease\n> -\tNO_PYTHON = YesPlease\n> -\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS\n> -else\n> -\tifneq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n> -\t\t# MSys2\n> -\t\tprefix = /usr/\n> -\t\t# Enable DEP\n> -\t\tBASIC_LDFLAGS += -Wl,--nxcompat\n> -\t\t# Enable ASLR (unless debugging)\n> -\t\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n> -\t\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n> -\t\tendif\n> -\t\tifeq (MINGW32,$(MSYSTEM))\n> -\t\t\tprefix = /mingw32\n> -\t\t\tHOST_CPU = i686\n> -\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n> -\t\tendif\n> -\t\tifeq (MINGW64,$(MSYSTEM))\n> -\t\t\tprefix = /mingw64\n> -\t\t\tHOST_CPU = x86_64\n> -\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n> -\t\telse\n> -\t\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n> -\t\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n> -\t\tendif\n> -\t\tCC = gcc\n> -\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n> -\t\t\t-fstack-protector-strong\n> -\t\tEXTLIBS += -lntdll\n> -\t\tINSTALL = /bin/install\n> -\t\tINTERNAL_QSORT = YesPlease\n> -\t\tHAVE_LIBCHARSET_H = YesPlease\n> -\t\tUSE_GETTEXT_SCHEME = fallthrough\n> -\t\tUSE_LIBPCRE = YesPlease\n> -\t\tUSE_NED_ALLOCATOR = YesPlease\n> -\t\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n> -\t\t\t# Move system config into top-level /etc/\n> -\t\t\tETC_GITCONFIG = ../etc/gitconfig\n> -\t\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n> -\t\tendif\n> -\telse\n> -\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO\n> -\t\tNO_CURL = YesPlease\n> -\t\tNO_PYTHON = YesPlease\n> +\tUSE_GETTEXT_SCHEME = fallthrough\n> +\tUSE_LIBPCRE = YesPlease\n> +\tUSE_NED_ALLOCATOR = YesPlease\n> +\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n> +\t\t# Move system config into top-level /etc/\n> +\t\tETC_GITCONFIG = ../etc/gitconfig\n> +\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n> \tendif\n> endif\n> -endif\n> ifeq ($(uname_S),QNX)\n> \tCOMPAT_CFLAGS += -DSA_RESTART=0\n> \tEXPAT_NEEDS_XMLPARSE_H = YesPlease\n"},{"id":"469240","messageId":"xmqqmt7lxxr6.fsf@gitster.g","threadId":"58901","inReplyTo":"pull.1433.git.1670274213.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/2] Remove MSys Support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-12-18T02:15:57Z","receivedAt":"2022-12-18T02:16:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Harshil Jani via GitGitGadget\" writes:\n\n> The msysGit and the MSys v1.x has been dropped into this patch and the\n> USE_NED_ALLOCATOR variable was duplicated here in the implementation so its\n> deduplication was also made in this patch.\n>\n> Signed-off-by: Harshil-Jani harshiljani2002@gmail.com\n\nThanks, Harshil.\n\nI do not do Windows, so I sent a few drive-by comments to suggest\nimprovements that may help to make the patch more understandable,\nbut more importantly, I did not see the patch asking input from\nanybody who have worked on the port of Git to the Window system, so\nI ran the following\n\n$ git shortlog -sn --no-merges v2.39.0 -- compat/win\\*\\* compat/mingw.\\* | head -5\n 100\tJohannes Schindelin\n 56\tJohannes Sixt\n 41\tKarsten Blees\n 23\tErik Faye-Lund\n 13\tJeff Hostetler\n\nand then picked those names we still often see on the list to\nattract their attention.\n\n"},{"id":"469244","messageId":"xmqq4jttxt0u.fsf@gitster.g","threadId":"58901","inReplyTo":"xmqqsfhdxxyj.fsf@gitster.g","subject":"Re: [PATCH 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-12-18T03:58:09Z","receivedAt":"2022-12-18T04:05:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> \"Harshil-Jani via GitGitGadget\" writes:\n>\n>> From: Harshil-Jani \n>>\n>> The msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\n>> last known user for MSys1 + MinGW has switched to MSys2.\n>\n> It is curious that we can speak with such a certainty of the lack of\n> users of such a popular project. References?\n\nI see J6t mentioning about such a switch,\n\n https://lore.kernel.org/git/c9aec5b6-0a78-a580-3658-5189bd2075a6@kdbg.org/\n\nbut I do not know if it is sensible to claim that this was the last\nknown user switching away. Perhaps\n\n Last time the code around here was modified, which eventually\n led to 49d279f8 (windows: include the Python bits when building\n Git for Windows, 2022-07-29), the change was carefully written\n to keep things unchanged for Msys1, as at least one user\n (Johannes Sixt) who did crucial work to support Git on Windows\n and we did not want to break Msys1 (yet). In the discussion J6t\n confirmed that he no longer is on Msys1 (cf. [*1*]).\n\nto replace the paragraph, with this at the end\n\n [References]\n *1* https://lore.kernel.org/git/c9aec5b6-0a78-a580-3658-5189bd2075a6@kdbg.org/)\n\nexplain the change (be sure to explain ../THIS_IS_MSYSGIT bit, too,\nnot just the $(uname_R) bit), and then throw in something like\n\n There may be users other than J6t who needs a working Msys1, but\n we can revert this patch if it becomes necessary (i.e. when they\n complain).\n\nsomewhere?\n\nThanks.\n"},{"id":"469949","messageId":"9933d992-ffd3-b43c-559e-0de819408cda@gmx.de","threadId":"58901","inReplyTo":"xmqqmt7lxxr6.fsf@gitster.g","subject":"Re: [PATCH 0/2] Remove MSys Support","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2023-01-09T07:36:40Z","receivedAt":"2023-01-09T07:37:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Sun, 18 Dec 2022, Junio C Hamano wrote:\n\n> \"Harshil Jani via GitGitGadget\" writes:\n>\n> > The msysGit and the MSys v1.x has been dropped into this patch and the\n> > USE_NED_ALLOCATOR variable was duplicated here in the implementation so its\n> > deduplication was also made in this patch.\n> >\n> > Signed-off-by: Harshil-Jani harshiljani2002@gmail.com\n>\n> Thanks, Harshil.\n>\n> I do not do Windows, so I sent a few drive-by comments to suggest\n> improvements that may help to make the patch more understandable,\n> but more importantly, I did not see the patch asking input from\n> anybody who have worked on the port of Git to the Window system, so\n> I ran the following\n>\n> $ git shortlog -sn --no-merges v2.39.0 -- compat/win\\*\\* compat/mingw.\\* | head -5\n> 100\tJohannes Schindelin\n> 56\tJohannes Sixt\n> 41\tKarsten Blees\n> 23\tErik Faye-Lund\n> 13\tJeff Hostetler\n>\n> and then picked those names we still often see on the list to\n> attract their attention.\n\nI need to note that Harshil and I have been communicating about this\npatch before it was submitted. So here is my explicit ACK.\n\nCiao,\nJohannes\n"},{"id":"469950","messageId":"4a2ce224-85e4-5903-44bc-664aa5a59f91@gmx.de","threadId":"58901","inReplyTo":"xmqq4jttxt0u.fsf@gitster.g","subject":"Re: [PATCH 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2023-01-09T07:48:05Z","receivedAt":"2023-01-09T07:48:19Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 18 Dec 2022, Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n>\n> > \"Harshil-Jani via GitGitGadget\" writes:\n> >\n> >> From: Harshil-Jani \n> >>\n> >> The msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\n> >> last known user for MSys1 + MinGW has switched to MSys2.\n> >\n> > It is curious that we can speak with such a certainty of the lack of\n> > users of such a popular project. References?\n>\n> I see J6t mentioning about such a switch,\n>\n> https://lore.kernel.org/git/c9aec5b6-0a78-a580-3658-5189bd2075a6@kdbg.org/\n>\n> but I do not know if it is sensible to claim that this was the last\n> known user switching away. Perhaps\n>\n> Last time the code around here was modified, which eventually\n> led to 49d279f8 (windows: include the Python bits when building\n> Git for Windows, 2022-07-29), the change was carefully written\n> to keep things unchanged for Msys1, as at least one user\n> (Johannes Sixt) who did crucial work to support Git on Windows\n> and we did not want to break Msys1 (yet). In the discussion J6t\n> confirmed that he no longer is on Msys1 (cf. [*1*]).\n\nIt would be good to avoid over-indexing on individual person's\npreferences. While it seems to be quite common in the Git project, it is\nobvious how this harms the Git project more than e.g. focusing on users'\nneeds would.\n\nA more productive line of thought would therefore be:\n\n\tMSys has long fallen behind MSYS2 in features like Unicode or\n\tx86_64 support or even security bug fixes, and is therefore no\n\tlonger used by anyone in the Git developer community. The Git for\n\tWindows project itself started switching from MSys to MSYS2 early\n\tin 2015, i.e. about eight years ago. Let's drop supporting MSys as\n\ta development platform.\n\nCiao,\nJohannes\n\n>\n> to replace the paragraph, with this at the end\n>\n> [References]\n> *1* https://lore.kernel.org/git/c9aec5b6-0a78-a580-3658-5189bd2075a6@kdbg.org/)\n>\n> explain the change (be sure to explain ../THIS_IS_MSYSGIT bit, too,\n> not just the $(uname_R) bit), and then throw in something like\n>\n> There may be users other than J6t who needs a working Msys1, but\n> we can revert this patch if it becomes necessary (i.e. when they\n> complain).\n>\n> somewhere?\n>\n> Thanks.\n>\n"},{"id":"469953","messageId":"xmqq7cxwum6i.fsf@gitster.g","threadId":"58901","inReplyTo":"9933d992-ffd3-b43c-559e-0de819408cda@gmx.de","subject":"Re: [PATCH 0/2] Remove MSys Support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-01-09T08:49:57Z","receivedAt":"2023-01-09T08:58:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> I need to note that Harshil and I have been communicating about this\n> patch before it was submitted. So here is my explicit ACK.\n\nExcellent. Thanks.\n"},{"id":"469954","messageId":"xmqq358kum22.fsf@gitster.g","threadId":"58901","inReplyTo":"4a2ce224-85e4-5903-44bc-664aa5a59f91@gmx.de","subject":"Re: [PATCH 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-01-09T08:52:37Z","receivedAt":"2023-01-09T09:01:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> It would be good to avoid over-indexing on individual person's\n> preferences. While it seems to be quite common in the Git project, it is\n> obvious how this harms the Git project more than e.g. focusing on users'\n> needs would.\n>\n> A more productive line of thought would therefore be:\n>\n> \tMSys has long fallen behind MSYS2 in features like Unicode or\n> \tx86_64 support or even security bug fixes, and is therefore no\n> \tlonger used by anyone in the Git developer community. The Git for\n> \tWindows project itself started switching from MSys to MSYS2 early\n> \tin 2015, i.e. about eight years ago. Let's drop supporting MSys as\n> \ta development platform.\n\nNicely written.\n\nWill expect a reroll with Acked-by: added with updated description,\nhopefully by the end of the week when I'll come back online?\n\nThanks.\n\n"},{"id":"471302","messageId":"pull.1433.v2.git.1675309898.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":"pull.1433.git.1670274213.gitgitgadget@gmail.com","subject":"[PATCH v2 0/2] Remove MSys Support","fromName":"Harshil Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-02-02T03:51:36Z","receivedAt":"2023-02-02T03:51:44Z","isPatch":true,"sender":{"key":"name:Harshil Jani","avatar":null},"body":"I am trying to learn more about the git code base and came across the issue\nwhere the support of MSys environment was to be dropped. This patch is my\nfirst contribution towards it.\n\nThe msysGit and the MSys v1.x has been dropped into this patch and the\nUSE_NED_ALLOCATOR variable was duplicated here in the implementation so its\ndeduplication was also made in this patch.\n\nSigned-off-by: Harshil-Jani harshiljani2002@gmail.com\n\nHarshil-Jani (2):\n mingw: remove duplicate `USE_NED_ALLOCATOR` directive\n mingw: remove msysGit/MSYS1 support\n\n config.mak.uname | 86 ++++++++++++++++++++----------------------------\n 1 file changed, 35 insertions(+), 51 deletions(-)\n\n\nbase-commit: 35a62bb5798092d491e6c7e688db6cb1418c9098\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1433%2FHarshil-Jani%2Fdrop-Msys-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1433/Harshil-Jani/drop-Msys-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1433\n\nRange-diff vs v1:\n\n 1: bc79dfcc4d4 = 1: bc79dfcc4d4 mingw: remove duplicate `USE_NED_ALLOCATOR` directive\n 2: e6d3d280a4f ! 2: 0c0289343fb mingw: remove msysGit/MSYS1 support\n @@ Metadata\n ## Commit message ##\n mingw: remove msysGit/MSYS1 support\n \n - The msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\n - last known user for MSys1 + MinGW has switched to MSys2. So there was no\n - reason to keep the msysGit/MSys1 config section. This Patch intends to\n - remove the support of both the builds and throw an error on\n - execution.\n -\n - The output of `uname -r` if returns us with '1.' then it relates with MSys1\n - build environment and msysGit which we don't want to continue ahead and thus\n - an error can be expected.\n -\n - The MSYS2 is currently used into the MinGW so we can get that part\n - running directly without any conditionals required.\n + MSys has long fallen behind MSYS2 in features like Unicode or\n + x86_64 support or even security bug fixes, and is therefore no\n + longer used by anyone in the Git developer community. The Git for\n + Windows project itself started switching from MSys to MSYS2 early\n + in 2015, i.e. about eight years ago. Let's drop supporting MSys as\n + a development platform.\n \n Signed-off-by: Harshil-Jani \n \n\n-- \ngitgitgadget\n"},{"id":"471303","messageId":"bc79dfcc4d44e0f006dc64d75a2c7f8a11834229.1675309898.git.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":"pull.1433.v2.git.1675309898.gitgitgadget@gmail.com","subject":"[PATCH v2 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive","fromName":"Harshil-Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-02-02T03:51:37Z","receivedAt":"2023-02-02T03:51:45Z","isPatch":true,"sender":{"key":"name:Harshil-Jani","avatar":null},"body":"From: Harshil-Jani \n\nnedalloc was added to fix the slowness of memory allocator. Here\nspecifically for the MSys2 build there seems to be a duplication of\nUSE_NED_ALLOCATOR directive. So this patch intends to remove the\nduplicate USE_NED_ALLOCATOR and keeping it only into the MSys2 config\nsection so it still uses the nedalloc.\n\nSigned-off-by: Harshil-Jani \n---\n config.mak.uname | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex d63629fe807..377667c4bbc 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -652,7 +652,6 @@ ifeq ($(uname_S),MINGW)\n \tUSE_WIN32_IPC = YesPlease\n \tUSE_WIN32_MMAP = YesPlease\n \tMMAP_PREVENTS_DELETE = UnfortunatelyYes\n-\tUSE_NED_ALLOCATOR = YesPlease\n \tUNRELIABLE_FSTAT = UnfortunatelyYes\n \tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n \tNO_REGEX = YesPlease\n-- \ngitgitgadget\n\n"},{"id":"471304","messageId":"0c0289343fb086c19831bdd38707e94ad2cb60e3.1675309898.git.gitgitgadget@gmail.com","threadId":"58901","inReplyTo":"pull.1433.v2.git.1675309898.gitgitgadget@gmail.com","subject":"[PATCH v2 2/2] mingw: remove msysGit/MSYS1 support","fromName":"Harshil-Jani via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-02-02T03:51:38Z","receivedAt":"2023-02-02T03:51:46Z","isPatch":true,"sender":{"key":"name:Harshil-Jani","avatar":null},"body":"From: Harshil-Jani \n\nMSys has long fallen behind MSYS2 in features like Unicode or\nx86_64 support or even security bug fixes, and is therefore no\nlonger used by anyone in the Git developer community. The Git for\nWindows project itself started switching from MSys to MSYS2 early\nin 2015, i.e. about eight years ago. Let's drop supporting MSys as\na development platform.\n\nSigned-off-by: Harshil-Jani \n---\n config.mak.uname | 85 ++++++++++++++++++++----------------------------\n 1 file changed, 35 insertions(+), 50 deletions(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 377667c4bbc..965ec530837 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -623,6 +623,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n \tSHELL_PATH = /usr/coreutils/bin/bash\n endif\n ifeq ($(uname_S),MINGW)\n+\tifeq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n+\t\t$(error \"Building with MSys is no longer supported\")\n+\tendif\n \tpathsep = ;\n \tHAVE_ALLOCA_H = YesPlease\n \tNO_PREAD = YesPlease\n@@ -676,61 +679,43 @@ ifeq ($(uname_S),MINGW)\n \tRC = windres -O coff\n \tNATIVE_CRLF = YesPlease\n \tX = .exe\n-ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n-\thtmldir = doc/git/html/\n-\tprefix =\n+\t# MSys2\n+\tprefix = /usr/\n+\t# Enable DEP\n+\tBASIC_LDFLAGS += -Wl,--nxcompat\n+\t# Enable ASLR (unless debugging)\n+\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n+\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n+\tendif\n+\tifeq (MINGW32,$(MSYSTEM))\n+\t\tprefix = /mingw32\n+\t\tHOST_CPU = i686\n+\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n+\tendif\n+\tifeq (MINGW64,$(MSYSTEM))\n+\t\tprefix = /mingw64\n+\t\tHOST_CPU = x86_64\n+\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n+\telse\n+\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n+\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n+\tendif\n+\tCC = gcc\n+\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n+\t\t-fstack-protector-strong\n+\tEXTLIBS += -lntdll\n \tINSTALL = /bin/install\n-\tEXTLIBS += /mingw/lib/libz.a\n \tINTERNAL_QSORT = YesPlease\n \tHAVE_LIBCHARSET_H = YesPlease\n-\tNO_GETTEXT = YesPlease\n-\tNO_PYTHON = YesPlease\n-\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS\n-else\n-\tifneq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n-\t\t# MSys2\n-\t\tprefix = /usr/\n-\t\t# Enable DEP\n-\t\tBASIC_LDFLAGS += -Wl,--nxcompat\n-\t\t# Enable ASLR (unless debugging)\n-\t\tifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))\n-\t\t\tBASIC_LDFLAGS += -Wl,--dynamicbase\n-\t\tendif\n-\t\tifeq (MINGW32,$(MSYSTEM))\n-\t\t\tprefix = /mingw32\n-\t\t\tHOST_CPU = i686\n-\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup\n-\t\tendif\n-\t\tifeq (MINGW64,$(MSYSTEM))\n-\t\t\tprefix = /mingw64\n-\t\t\tHOST_CPU = x86_64\n-\t\t\tBASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup\n-\t\telse\n-\t\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n-\t\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n-\t\tendif\n-\t\tCC = gcc\n-\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \\\n-\t\t\t-fstack-protector-strong\n-\t\tEXTLIBS += -lntdll\n-\t\tINSTALL = /bin/install\n-\t\tINTERNAL_QSORT = YesPlease\n-\t\tHAVE_LIBCHARSET_H = YesPlease\n-\t\tUSE_GETTEXT_SCHEME = fallthrough\n-\t\tUSE_LIBPCRE = YesPlease\n-\t\tUSE_NED_ALLOCATOR = YesPlease\n-\t\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n-\t\t\t# Move system config into top-level /etc/\n-\t\t\tETC_GITCONFIG = ../etc/gitconfig\n-\t\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n-\t\tendif\n-\telse\n-\t\tCOMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO\n-\t\tNO_CURL = YesPlease\n-\t\tNO_PYTHON = YesPlease\n+\tUSE_GETTEXT_SCHEME = fallthrough\n+\tUSE_LIBPCRE = YesPlease\n+\tUSE_NED_ALLOCATOR = YesPlease\n+\tifeq (/mingw64,$(subst 32,64,$(prefix)))\n+\t\t# Move system config into top-level /etc/\n+\t\tETC_GITCONFIG = ../etc/gitconfig\n+\t\tETC_GITATTRIBUTES = ../etc/gitattributes\n \tendif\n endif\n-endif\n ifeq ($(uname_S),QNX)\n \tCOMPAT_CFLAGS += -DSA_RESTART=0\n \tEXPAT_NEEDS_XMLPARSE_H = YesPlease\n-- \ngitgitgadget\n"},{"id":"471362","messageId":"a4ce7778-c108-99ff-f97e-2ebb8cb605aa@gmx.de","threadId":"58901","inReplyTo":"pull.1433.v2.git.1675309898.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 0/2] Remove MSys Support","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2023-02-02T13:59:39Z","receivedAt":"2023-02-02T13:59:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Harshil,\n\nOn Thu, 2 Feb 2023, Harshil Jani via GitGitGadget wrote:\n\n> Range-diff vs v1:\n>\n> 1: bc79dfcc4d4 = 1: bc79dfcc4d4 mingw: remove duplicate `USE_NED_ALLOCATOR` directive\n> 2: e6d3d280a4f ! 2: 0c0289343fb mingw: remove msysGit/MSYS1 support\n> @@ Metadata\n> ## Commit message ##\n> mingw: remove msysGit/MSYS1 support\n>\n> - The msysGit (i.e. Git for Windows 1.x' SDK) is no longer used and the\n> - last known user for MSys1 + MinGW has switched to MSys2. So there was no\n> - reason to keep the msysGit/MSys1 config section. This Patch intends to\n> - remove the support of both the builds and throw an error on\n> - execution.\n> -\n> - The output of `uname -r` if returns us with '1.' then it relates with MSys1\n> - build environment and msysGit which we don't want to continue ahead and thus\n> - an error can be expected.\n> -\n> - The MSYS2 is currently used into the MinGW so we can get that part\n> - running directly without any conditionals required.\n> + MSys has long fallen behind MSYS2 in features like Unicode or\n> + x86_64 support or even security bug fixes, and is therefore no\n> + longer used by anyone in the Git developer community. The Git for\n> + Windows project itself started switching from MSys to MSYS2 early\n> + in 2015, i.e. about eight years ago. Let's drop supporting MSys as\n> + a development platform.\n>\n> Signed-off-by: Harshil-Jani \n\nThis seems to address Junio's concern.\n\nI'm fine with these patches, too. Here's my ACK.\n\nCiao,\nJohannes\n"},{"id":"471365","messageId":"xmqqlelgvyp5.fsf@gitster.g","threadId":"58901","inReplyTo":"a4ce7778-c108-99ff-f97e-2ebb8cb605aa@gmx.de","subject":"Re: [PATCH v2 0/2] Remove MSys Support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-02-02T16:06:46Z","receivedAt":"2023-02-02T16:06:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> I'm fine with these patches, too. Here's my ACK.\n\nThanks, will re-queue with your ack.\n"}]}