Skip to content

revision_mode = 'scm_folder': Only check if conanfile_path is dirty#14330

Merged
memsharded merged 1 commit into
conan-io:release/2.0from
BobIsOnFire:fix/scm_folder-dont-fail-if-repo-is-partially-dirty
Jul 19, 2023
Merged

revision_mode = 'scm_folder': Only check if conanfile_path is dirty#14330
memsharded merged 1 commit into
conan-io:release/2.0from
BobIsOnFire:fix/scm_folder-dont-fail-if-repo-is-partially-dirty

Conversation

@BobIsOnFire

@BobIsOnFire BobIsOnFire commented Jul 19, 2023

Copy link
Copy Markdown
Contributor

Changelog: Fix: Allow repository being dirty outside of conanfile.py folder when using revision_mode = "scm_folder".
Docs: omit

Hi!
I thought that it makes more sense to check git status only for current directory, as Conan needs only that directory to calculate its revision. I usually have quite a dirty repo, and don't really like that Conan chokes on it :)

@memsharded memsharded self-assigned this Jul 19, 2023
@memsharded memsharded added this to the 2.0.10 milestone Jul 19, 2023

@memsharded memsharded left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good, thanks very much!

@memsharded memsharded modified the milestones: 2.0.10, 2.0.9 Jul 19, 2023
@memsharded memsharded merged commit d09ae5b into conan-io:release/2.0 Jul 19, 2023
@memsharded

Copy link
Copy Markdown
Member

Merged for next 2.0.9, thanks again for your contribution

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.

2 participants