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

Remove confusing TrimPrefix(... git.BranchPrefix) #20369

Merged
merged 4 commits into from
Jul 16, 2022

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jul 14, 2022

This strings.TrimPrefix(repo.DefaultBranch, git.BranchPrefix) seems incorrect.

The repo.DefaultBranch is already used as a branch name above, not a ref name.

Make Repository.GetDefaultBranch return the real branch name, instead of the ref name. Then there is no need to do TrimPrefix for repo.DefaultBranch

@wxiaoguang wxiaoguang requested a review from zeripath July 14, 2022 12:43
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 14, 2022
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 14, 2022
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Jul 14, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 15, 2022
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (main@57e0bf4). Click here to learn what that means.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##             main   #20369   +/-   ##
=======================================
  Coverage        ?   46.92%           
=======================================
  Files           ?      976           
  Lines           ?   135193           
  Branches        ?        0           
=======================================
  Hits            ?    63438           
  Misses          ?    63990           
  Partials        ?     7765           
Impacted Files Coverage Δ
modules/git/repo_branch.go 66.01% <0.00%> (ø)
services/repository/adopt.go 26.73% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 57e0bf4...2549fc1. Read the comment docs.

@wxiaoguang wxiaoguang merged commit fee0e4d into go-gitea:main Jul 16, 2022
@wxiaoguang wxiaoguang deleted the fix-branch-prefix-trim branch July 16, 2022 12:22
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 18, 2022
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Comment on PrivateUsers option for gitea.service (go-gitea#20383)
  [skip ci] Updated translations via Crowdin
  Remove confusing TrimPrefix(... git.BranchPrefix) (go-gitea#20369)
  Set target on create release with existing tag (go-gitea#20381)
  Initialize cron last (go-gitea#20373)
  Allow access to the Public Organization Member lists with minimal permissions (go-gitea#20330)
vsysoev pushed a commit to IntegraSDL/gitea that referenced this pull request Aug 10, 2022
Make Repository.GetDefaultBranch return the real branch name, instead of the ref name. Then there is no need to do TrimPrefix for repo.DefaultBranch
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants