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.

Sign up for GitHub

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

Jump to bottom

Fix loadOneBranch panic #29938

Merged
merged 2 commits into from Mar 20, 2024
Merged

Fix loadOneBranch panic #29938

merged 2 commits into from Mar 20, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Mar 20, 2024 •
edited

Try to fix #29936

Far from ideal, but still better than panic.

@wxiaoguang wxiaoguang added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 20, 2024
@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Mar 20, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 20, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 20, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 20, 2024
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 20, 2024
@wxiaoguang wxiaoguang changed the title Fix GetDivergingCommits Fix loadOneBranch panic Mar 20, 2024
This was referenced Mar 20, 2024
Closed
Merged
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Mar 20, 2024
delvh
delvh approved these changes Mar 20, 2024
View reviewed changes
modules/git/repo.go Show resolved Hide resolved
@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 Mar 20, 2024
delvh
delvh reviewed Mar 20, 2024
View reviewed changes
modules/git/repo.go
@@ -283,7 +283,7 @@ type DivergeObject struct {
// GetDivergingCommits returns the number of commits a targetBranch is ahead or behind a baseBranch
func GetDivergingCommits(ctx context.Context, repoPath, baseBranch, targetBranch string) (do DivergeObject, err error) {
cmd := NewCommand(ctx, "rev-list", "--count", "--left-right").
AddDynamicArguments(baseBranch + "..." + targetBranch)
AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
Copy link
Member

Choose a reason for hiding this comment

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

Sorry, meant this change.
(Did GitHub change its mechanism what is displayed when?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

And GetDivergingCommits is covered by tests, adding -- is right here.

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps we should add a comment for future readers:

Suggested change
AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--") // '--' needed so that git knows what is a reference and what is a file in case of an error

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not the only place using it. I don't think it's worth to repeat such comments. It is a git's standard mechanism.

image

@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 Mar 20, 2024
wxiaoguang added a commit that referenced this pull request Mar 20, 2024
@wxiaoguang
Fix loadOneBranch panic (#29938) (#29939)
b4a6c6f 
Backport #29938

Try to fix #29936

Far from ideal, but still better than panic.
@lafriks lafriks enabled auto-merge (squash) March 20, 2024 15:11
@lafriks lafriks merged commit 2115147 into go-gitea:main Mar 20, 2024
26 checks passed
@wxiaoguang wxiaoguang deleted the fix-git-dash branch March 20, 2024 15:47
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 20, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into noshift
b995486 
* origin/main:
  Fix loadOneBranch panic (go-gitea#29938)
  Fix comment review avatar alignment (go-gitea#29935)
  Remove the negative margin from `.page-content` (go-gitea#29922)
  Move notifications to a standalone file (go-gitea#29930)
  Remove unnecessary ".Link" usages (go-gitea#29929)
  Remove unnecessary ".Link" usages (go-gitea#29909)
  Show Actions post step when it's running (go-gitea#29926)
  Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925)
  Restore deleted branches when syncing (go-gitea#29898)
  Don't lock using GitHub actions (go-gitea#29913)
  Remove jQuery `.attr` from the user search box (go-gitea#29919)
  Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918)
  Remove jQuery `.attr` from the image diff (go-gitea#29917)
  Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916)
  Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915)
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 20, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into js-loading
895fa8b 
* origin/main:
  Fix loadOneBranch panic (go-gitea#29938)
  Fix comment review avatar alignment (go-gitea#29935)
  Remove the negative margin from `.page-content` (go-gitea#29922)
  Move notifications to a standalone file (go-gitea#29930)
  Remove unnecessary ".Link" usages (go-gitea#29929)
  Remove unnecessary ".Link" usages (go-gitea#29909)
  Show Actions post step when it's running (go-gitea#29926)
  Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925)
  Restore deleted branches when syncing (go-gitea#29898)
  Don't lock using GitHub actions (go-gitea#29913)
  Remove jQuery `.attr` from the user search box (go-gitea#29919)
  Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918)
  Remove jQuery `.attr` from the image diff (go-gitea#29917)
  Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916)
  Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915)
  Switch to the maintained vitest extension (go-gitea#29914)
silverwind pushed a commit to lunny/gitea that referenced this pull request Mar 20, 2024
@wxiaoguang @silverwind
Fix loadOneBranch panic (go-gitea#29938)
0db1944 
Try to fix go-gitea#29936

Far from ideal, but still better than panic.
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 21, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
1be56f1 
* giteaofficial/main: (34 commits)
  Refactor URL detection (go-gitea#29960)
  Solving the issue of UI disruption when the review is deleted without refreshing (go-gitea#29951)
  Fix JS error and improve error message styles (go-gitea#29963)
  Fix the bug that user may logout if he switch pages too fast (go-gitea#29962)
  Cancel previous runs of the same PR automatically (go-gitea#29961)
  Exclude `routers/private/tests` from air (go-gitea#29949)
  Remove codecov badge (go-gitea#29950)
  Misc color tweaks (go-gitea#29943)
  Fix and rewrite markup anchor processing (go-gitea#29931)
  Remove fomantic grid module (go-gitea#29894)
  Add background to dashboard navbar, fix missing padding (go-gitea#29940)
  Prevent layout shift in `<overflow-menu>` items (go-gitea#29831)
  Fix loadOneBranch panic (go-gitea#29938)
  Fix comment review avatar alignment (go-gitea#29935)
  Remove the negative margin from `.page-content` (go-gitea#29922)
  Move notifications to a standalone file (go-gitea#29930)
  Remove unnecessary ".Link" usages (go-gitea#29929)
  Remove unnecessary ".Link" usages (go-gitea#29909)
  Show Actions post step when it's running (go-gitea#29926)
  Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925)
  ...

# Conflicts:
#	templates/user/dashboard/issues.tmpl
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 21, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into npmlink
62b58d5 
* origin/main: (332 commits)
  Refactor external URL detection (go-gitea#29973)
  Refactor repo header/list (go-gitea#29969)
  Fix various loading states, remove `.loading` class (go-gitea#29920)
  Update register application URL for GitLab (go-gitea#29959)
  Refactor StringsToInt64s (go-gitea#29967)
  Switch to happy-dom for testing (go-gitea#29948)
  Performance improvements for pull request list page (go-gitea#29900)
  Refactor URL detection (go-gitea#29960)
  Solving the issue of UI disruption when the review is deleted without refreshing (go-gitea#29951)
  Fix JS error and improve error message styles (go-gitea#29963)
  Fix the bug that user may logout if he switch pages too fast (go-gitea#29962)
  Cancel previous runs of the same PR automatically (go-gitea#29961)
  Exclude `routers/private/tests` from air (go-gitea#29949)
  Remove codecov badge (go-gitea#29950)
  Misc color tweaks (go-gitea#29943)
  Fix and rewrite markup anchor processing (go-gitea#29931)
  Remove fomantic grid module (go-gitea#29894)
  Add background to dashboard navbar, fix missing padding (go-gitea#29940)
  Prevent layout shift in `<overflow-menu>` items (go-gitea#29831)
  Fix loadOneBranch panic (go-gitea#29938)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delvh delvh delvh approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Error 500 when accessing branches in repo
5 participants
@wxiaoguang @lunny @delvh @lafriks @GiteaBot