Use `m2-git` on Windows

[jakirkham]

The git package on Windows is binary repackaged from upstream. However it includes some MSYS2 bits in itself ( https://github.com/conda-forge/git-feedstock/issues/135 ), which clobber other MSYS2 packages we might use. To address this, switch to m2-git on Windows.

---

Checklist

• [x] Used a personal fork of the feedstock to propose changes
• [x] Bumped the build number (if the version is unchanged)
• [ ] Reset the build number to 0 (if the version changed)
• [x] Re-rendered with the latest conda-smithy (Use the phrase code>@<space/conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
• [x] Ensured the license file is being packaged.

[conda-forge-webservices[bot]]

Hi! This is the friendly automated conda-forge-linting service.

I wanted to let you know that I linted all conda-recipes in your PR (recipe) and found some lint.

Here's what I've got...

For recipe:

• noarch packages can't have selectors. If the selectors are necessary, please remove noarch: python.

[conda-forge-webservices[bot]]

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

[beckermr]

As it stands now the build makes to artifacts with identical build numbers and different hashes. At minimum, it'd be advisable to put win vs unix in the build string so people can understand the difference.

[isuruf]

This recipe follows docs at https://conda-forge.org/docs/maintainer/knowledge_base.html#noarch-packages-with-os-specific-dependencies .

If you think that's wrong, maybe open an issue in website repo?

[jakirkham]

@beckermr , please see this doc

Edit: Isuru was faster 😅 Thanks Isuru! 🙏

[beckermr]

Ohhhhhhh my apologies everyone! Thank you for pointing that out. I still think the build string change would be helpful to others, but otherwise LGTM!

[jakirkham]

@conda-forge-admin , please re-render

[github-actions[bot]]

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you, but it looks like I wasn't able to push to the use_m2-git_win branch of jakirkham-feedstocks/conda-smithy-feedstock. Did you check the "Allow edits from maintainers" box?

NOTE: Our webservices cannot push to PRs from organization accounts or PRs from forks made from organization forks because of GitHub permissions. Please fork the feedstock directly from conda-forge into your personal GitHub account.

This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-smithy-feedstock/actions/runs/9186003690.

[jakirkham]

@conda-forge-admin , please re-render

[github-actions[bot]]

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you, but it looks like there was nothing to do.

This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-smithy-feedstock/actions/runs/9186045758.

[h-vetinari]

FWIW, for me this broke having git understand remote references (showing where HEAD and other remote branches are when doing git log).

[beckermr]

That is rather confusing to me. Is m2-git on windows broken?

[h-vetinari]

Possibly. Here's an example of the difference:

Without m2-git (== situation before this PR even with an activated environment):

After this PR:

My builder environment contains smithy; not only are branch heads not shown anymore, but apparently tags are affected too.

[beckermr]

Ouch. @jakirkham @isuruf @xhochy any ideas or comments here?

[jakirkham]

Does this have something to do with where m2-git looks for .gitconfig or perhaps the version of git used?