Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Git.get_url_and_commit raising for some Git configs #15271

Merged
merged 1 commit into from
Dec 24, 2023

Conversation

Solviana
Copy link
Contributor

@Solviana Solviana commented Dec 13, 2023

Changelog: Bugfix: Fix Git.get_url_and_commit raising for some Git configs.
Docs: Omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

@CLAassistant
Copy link

CLAassistant commented Dec 13, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be necessary to add a test that covers the need for this, so if someone sometime removes it, the test will fail.

There are a bunch of tests in test_git.py that you could use as a base, but let us know if you need help, we can even try to contribute the test if necessary.

@Solviana
Copy link
Contributor Author

It would be necessary to add a test that covers the need for this, so if someone sometime removes it, the test will fail.

There are a bunch of tests in test_git.py that you could use as a base, but let us know if you need help, we can even try to contribute the test if necessary.

I'll get familiar with your setup and I will create the tests, no prob!

@memsharded
Copy link
Member

Hi @Solviana

I am submitting a very related PR to fix a Git.is_dirty() bug, see #15289, you can see a unit test there, I hope it helps.

If you'd like to include this fix in 2.0.15, it will be most likely branched tomorrow, if you could manage to do the test, please let me know, and I'll try to include it.

@Solviana Solviana force-pushed the feature/issue-15261 branch 2 times, most recently from bc79ebf to eee2daa Compare December 23, 2023 13:17
@Solviana
Copy link
Contributor Author

@memsharded

I was afk for a while but now I updated the PR with some tests. Can you review this again?

@Solviana Solviana force-pushed the feature/issue-15261 branch from eee2daa to 09d9774 Compare December 23, 2023 15:19
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look great, thanks very much!

@memsharded memsharded added this to the 2.1 milestone Dec 23, 2023
@AbrilRBS
Copy link
Member

AbrilRBS commented Dec 24, 2023

The new flags are 10 and 15 years old, respectively - no need for us to worry about that I think heh.

I've now modified the PR message, and will merge this to be released for 2.1, thanks a lot for your contribution @Solviana, we really appreciate it :)

@AbrilRBS AbrilRBS changed the title Fix dirty repo handling Fix Git.get_url_and_commit raising for some Git configs Dec 24, 2023
@AbrilRBS AbrilRBS merged commit 1e5f8e3 into conan-io:develop2 Dec 24, 2023
2 checks passed
@Solviana Solviana deleted the feature/issue-15261 branch December 24, 2023 12:59
memsharded pushed a commit to memsharded/conan that referenced this pull request Dec 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants