On 07/06/2021 01:54, Junio C Hamano wrote: > "Matthew Rogers via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > >> This pull request comes from our discussion here[1], and I think these >> patches provide a good compromise around the concerns discussed there >> >> 1: >> https://lore.kernel.org/git/CAOjrSZusMSvs7AS-ZDsV8aQUgsF2ZA754vSDjgFKMRgi_oZAWw@xxxxxxxxxxxxxx/ >> >> CCing the people involved in the original discussion. cc: Philip Oakley >> philipoakley@iee.email cc: Sibi Siddharthan >> sibisiddharthan.github@xxxxxxxxx, cc: Johannes Schindelin >> johannes.schindelin@xxxxxx, cc: Danh Doan congdanhqx@xxxxxxxxx >> >> Matthew Rogers (3): >> cmake: add knob to disable vcpkg >> cmake: create compile_commands.json by default >> cmake: add warning for ignored MSGFMT_EXE > I am neither cmake nor windows person, so I'll queue this as-is and > wait for the stakeholders to chime in. > > I did wonder if we want this to be applicable to the maintenance > track for 2.31, though. There is a textual conflict with the > addition of SIMPLE_IPC that happened during 2.32 cycle, which is > easily resolvable. > > I am tempted to queue a version of these three patches rebased on to > 'maint' after making sure that the result of merging that into > 'master' is byte-for-byte identical to applying these three patches > directly on to 'master'. Sorry for the delay - I've been off-line and I'm only now catching up. Could we confirm that the CI actually tests the update. IIRC the yml setup preloaded the vcpkg artefacts that this change looks to make work 'out of the box'. Philip
