Refactor git version functions and check compatibility #29155
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
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/L
wxiaoguang
added
type/enhancement
wxiaoguang
force-pushed
the
improve-git-version
branch
from
d0150b8
to
4789e2e
Compare
delvh
reviewed
Feb 13, 2024
| return gitVersion, err | ||
| // version string is like: "git version 2.29.3" or "git version 2.29.3.windows.1" | ||
| versionString := fields[2] | ||
| if pos := strings.Index(versionString, "windows"); pos >= 1 { |
There was a problem hiding this comment.
>= 1, because there is versionString[:pos-1] below.
There was a problem hiding this comment.
But we could use >= 0 and :pos.
There was a problem hiding this comment.
That's from old code. I guess it might want to work with 2.3.4.windows and 2.3.4-windows
There was a problem hiding this comment.
Right, the -1 is needed for the prefix and therefore i must be >=1.
wxiaoguang
added
backport/done
silverwind
approved these changes
Feb 13, 2024
GiteaBot
added
lgtm/need 1
Co-authored-by: delvh <[email protected]>
lunny
approved these changes
Feb 14, 2024
GiteaBot
added
lgtm/done
delvh
approved these changes
Feb 14, 2024
wxiaoguang
added
the
reviewed/wait-merge
|
Thank you for reviewing and approving. The backport is done manually : #29157 There is a slight difference in the backport, to try the best to avoid breaking a stable release: bypass the GIT_FLUSH bug there. Feel free to edit the PR directly if you feel that it shouldn't be done. |
GiteaBot
removed
the
reviewed/wait-merge
silverwind
pushed a commit
to silverwind/gitea
that referenced
this pull request
Feb 15, 2024
Introduce a new function checkGitVersionCompatibility, when the git version can't be used by Gitea, tell the end users to downgrade or upgrade. The refactored functions are related to make the code easier to test. And simplify the comments for "safe.directory" --------- Co-authored-by: delvh <[email protected]>
wxiaoguang
added a commit
that referenced
this pull request
Feb 17, 2024
silverwind
pushed a commit
to silverwind/gitea
that referenced
this pull request
Feb 20, 2024
Introduce a new function checkGitVersionCompatibility, when the git version can't be used by Gitea, tell the end users to downgrade or upgrade. The refactored functions are related to make the code easier to test. And simplify the comments for "safe.directory" --------- Co-authored-by: delvh <[email protected]>
|
Automatically locked because of our CONTRIBUTING guidelines |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Introduce a new function checkGitVersionCompatibility, when the git version can't be used by Gitea, tell the end users to downgrade or upgrade. The refactored functions are related to make the code easier to test.
And simplify the comments for "safe.directory"