Hi, On Fri, 29 Jul 2022, Johannes Schindelin via GitGitGadget wrote: > Range-diff vs v1: > > -: ----------- > 1: 5d9b087625a windows: include the Python bits when building Git for Windows > -: ----------- > 2: 019fb837d68 mingw: remove unneeded `NO_GETTEXT` directive > 1: a5739b9cce8 ! 3: 7dc0a1a9aa8 mingw: include the Python parts in the build > @@ Metadata > Author: Johannes Schindelin <Johannes.Schindelin@xxxxxx> > > ## Commit message ## > - mingw: include the Python parts in the build > + mingw: remove unneeded `NO_CURL` directive > > - While Git for Windows does not _ship_ Python (in order to save on > - bandwidth), MSYS2 provides very fine Python interpreters that users can > - easily take advantage of, by using Git for Windows within its SDK. > + In df5218b4c30 (config.mak.uname: support MSys2, 2016-01-13), we > + introduced support for building Git for Windows in the then-brand new > + Git for Windows v2.x build environment that was based off of MSYS2. > + > + To do that, we split the non-msysGit part (that targeted MSys1) in two, > + and instead of sharing the `NO_CURL = YesPlease` setting with MSys1, we > + overrode it for MSYS2 with the empty value because we very much want to > + build Git for Windows with libcurl. > + > + But that was unnecessary: we never set that variable beforehand, > + therefore there is no need to override it. > + > + Let's just remove that unnecessary line. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > > ## config.mak.uname ## > @@ config.mak.uname: else > + HAVE_LIBCHARSET_H = YesPlease > + USE_GETTEXT_SCHEME = fallthrough > USE_LIBPCRE = YesPlease > - NO_CURL = > +- NO_CURL = > USE_NED_ALLOCATOR = YesPlease > -+ NO_PYTHON = > ifeq (/mingw64,$(subst 32,64,$(prefix))) > # Move system config into top-level /etc/ > - ETC_GITCONFIG = ../etc/gitconfig Oh, that's funny. This is actually the first time I personally see `range-diff` matching up a wrong patch pair (because it really looks for the minimal diff between the diffs). It is of course nonsense to match up the original patch with the `NO_CURL` patch. Ciao, Dscho
