Check commits even with shallow clone of tags #15023
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: John Sallay <jasallay@gmail.com>
|
|
memsharded
reviewed
Oct 29, 2023
There was a problem hiding this comment.
Thanks for your contribution @jsallay !
Some CI tests are failing, the new check is producing unexpected errors, it probably needs to be more conservative and raise only on very evident cases.
conan/tools/scm/git.py
Outdated
| return True | ||
| except Exception as e: | ||
| # The error message contains the command and the commit if it can't find it. | ||
| if str(e).count(commit) == 2: |
There was a problem hiding this comment.
It seems this check is not capturing all scenarios.
Signed-off-by: John Sallay <jasallay@gmail.com>
memsharded
reviewed
Nov 2, 2023
memsharded
reviewed
Nov 3, 2023
|
I've added in tests for a case where it should find the commit and one where it should not. Let me know if you have any other suggestions. |
It is great. I'll merge when the PR is green |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Fix: Make
Git()check commits in remote server even for shallow clones.Docs: omit
Fixes #14928
When performing a shallow clone of a tag (e.g.
git clone https://github.com/conan-io/conan --depth=1 -b 2.0.13) it does not copy and of the branches or history. Thecommit_in_remotemethod of theGitclass only checks local information. This PR will additionally check the remote if needed.I tested this by cloning a repo twice - one as a normal clone and the other with a shallow clone of a tag. I created an additional commit in each repo. I ran of total of 8 tests - checking all possibilities of:
The
git fetchperformed requires a connection to the remote repo. I wanted to make sure that it failed gracefully in an offline scenario. The function performed as expected in all cases.Without an internet connection, the function waits until the command times out and then throws an error (which is communicated to the user).
developbranch, documenting this one.