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

Can't change branch in pull request #13684

Closed
f1mishutka opened this issue Nov 24, 2020 · 7 comments · Fixed by #14598
Closed

Can't change branch in pull request #13684

f1mishutka opened this issue Nov 24, 2020 · 7 comments · Fixed by #14598
Labels
type/bug

Comments

@f1mishutka
Copy link

Hello!

I can't change branch in PR after PR was created.
Please take a look at this short screencast to see how it looks like: https://mttm.ml/16

Details:

  • Gitea version (or commit ref): 1.13.0-rc2
  • Git version: 2.20.1
  • Operating system: Linux Debian 10 x64
  • Database: MySQL
  • Can you reproduce the bug at https://try.gitea.io: NO (seems to work fine there)
  • Log gist (seems like no errors fro me):
2020/11/24 10:55:24 cmd/web.go:108:runWeb() [I] Starting Gitea on PID: 5384
2020/11/24 10:55:24 ...dules/setting/git.go:91:newGit() [I] Git Version: 2.20.1, Wire Protocol Version 2 Enabled
2020/11/24 10:55:24 routers/init.go:127:GlobalInit() [T] AppPath: /opt/gitea/gitea
2020/11/24 10:55:24 routers/init.go:128:GlobalInit() [T] AppWorkPath: /opt/gitea
2020/11/24 10:55:24 routers/init.go:129:GlobalInit() [T] Custom path: /opt/gitea/custom
2020/11/24 10:55:24 routers/init.go:130:GlobalInit() [T] Log path: /opt/gitea/log
[Macaron] 2020-11-24 10:55:33: Started GET /pulls for 80.249.94.216
[Macaron] 2020-11-24 10:55:33: Completed GET /pulls 302 Found in 782.228µs
[Macaron] 2020-11-24 10:55:33: Started GET /user/login for 80.249.94.216
[Macaron] 2020-11-24 10:55:33: Completed GET /user/login 302 Found in 7.49403ms
[Macaron] 2020-11-24 10:55:33: Started GET /pulls for 80.249.94.216
[Macaron] 2020-11-24 10:55:33: Completed GET /pulls 200 OK in 263.772952ms
[Macaron] 2020-11-24 10:55:34: Started GET /user/avatar/mishutka/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /user/avatar/mishutka/-1 302 Found in 28.199902ms
[Macaron] 2020-11-24 10:55:34: Started GET /user/avatar/fst/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /user/avatar/fst/-1 302 Found in 4.836308ms
[Macaron] 2020-11-24 10:55:34: Started GET /user/avatar/mitoteam/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /user/avatar/mitoteam/-1 302 Found in 4.10068ms
[Macaron] 2020-11-24 10:55:34: Started GET /user/avatar/seniorszen/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Started GET /user/avatar/andrey/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /user/avatar/seniorszen/-1 302 Found in 5.219339ms
[Macaron] 2020-11-24 10:55:34: Completed GET /user/avatar/andrey/-1 302 Found in 7.103264ms
[Macaron] 2020-11-24 10:55:34: Started GET /avatars/af22c6704d0d034a2a890cbd8b8107fe for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Started GET /avatars/87a45388b9b4310a5246118ccdda83b5 for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /avatars/af22c6704d0d034a2a890cbd8b8107fe 200 OK in 1.5027ms
[Macaron] 2020-11-24 10:55:34: Completed GET /avatars/87a45388b9b4310a5246118ccdda83b5 200 OK in 2.112444ms
[Macaron] 2020-11-24 10:55:34: Started GET /user/events for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Started GET /manifest.json for 80.249.94.216
[Macaron] 2020-11-24 10:55:34: Completed GET /manifest.json 200 OK in 2.983485ms
[Macaron] 2020-11-24 10:55:34: Started GET /serviceworker.js for 80.249.94.216
[Macaron] [Static] Serving /serviceworker.js
[Macaron] 2020-11-24 10:55:34: Completed GET /serviceworker.js 304 Not Modified in 670.405µs
[Macaron] 2020-11-24 10:55:36: Started GET /serviceworker.js for 80.249.94.216
[Macaron] [Static] Serving /serviceworker.js
[Macaron] 2020-11-24 10:55:36: Completed GET /serviceworker.js 304 Not Modified in 817.972µs
[Macaron] 2020-11-24 10:55:37: Started GET /fst/tws/pulls/284 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /fst/tws/pulls/284 200 OK in 220.307074ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/mishutka/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/victor/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Started GET /repo-avatars/6-9d873e9c944048a8c29650f062bf781e for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /repo-avatars/6-9d873e9c944048a8c29650f062bf781e 200 OK in 1.604397ms
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/mishutka/-1 302 Found in 7.38353ms
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/victor/-1 302 Found in 10.252834ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/andrey/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/andrey/-1 302 Found in 5.244154ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/bandmaster/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/bandmaster/-1 302 Found in 4.893652ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/doguy/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/doguy/-1 302 Found in 5.393274ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/office501/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/office501/-1 302 Found in 6.011316ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/thesis/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/redmine/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Started GET /avatars/35d225edcbaf7d89d91f766cbb6deb05 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Started GET /avatars/86ee878068094f51cc14b47b54a637dc for 80.249.94.216
[Macaron] PANIC: middleware render hasn't been registered
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/render.go:653 (0xd8c998)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/render.go:710 (0xd8c97d)
/go/src/code.gitea.io/gitea/routers/routes/routes.go:166 (0x21a7e55)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:79 (0xd82a92)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:157 (0xd81414)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:135 (0xd811b9)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:121 (0xd82c1c)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:112 (0xd947a5)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/recovery.go:161 (0xd94798)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/logger.go:40 (0xd867d7)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:157 (0xd81414)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:135 (0xd811b9)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:121 (0xd82c1c)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:112 (0xd93aa9)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/logger.go:52 (0xd93a94)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/logger.go:40 (0xd867d7)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:157 (0xd81414)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:135 (0xd811b9)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/context.go:121 (0xd82c1c)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/router.go:187 (0xd959f0)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/router.go:303 (0xd8f185)
/go/src/code.gitea.io/gitea/vendor/gitea.com/macaron/macaron/macaron.go:218 (0xd87b4d)
/go/src/code.gitea.io/gitea/vendor/github.com/gorilla/context/context.go:141 (0x128ea93)
/usr/local/go/src/net/http/server.go:2042 (0x777623)
/usr/local/go/src/net/http/server.go:2843 (0x77ac22)
/usr/local/go/src/net/http/server.go:1925 (0x77642c)
/usr/local/go/src/runtime/asm_amd64.s:1374 (0x478820)
[Macaron] 2020-11-24 10:55:37: Completed GET /avatars/86ee878068094f51cc14b47b54a637dc 500 Internal Server Error in 5.228459ms
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/thesis/-1 302 Found in 8.7415ms
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/redmine/-1 302 Found in 8.072278ms
[Macaron] 2020-11-24 10:55:37: Completed GET /avatars/35d225edcbaf7d89d91f766cbb6deb05 200 OK in 8.222648ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/valuxin/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/valuxin/-1 302 Found in 4.6403ms
[Macaron] 2020-11-24 10:55:37: Started GET /user/avatar/victor_litvin/-1 for 80.249.94.216
[Macaron] 2020-11-24 10:55:37: Completed GET /user/avatar/victor_litvin/-1 302 Found in 4.512851ms
[Macaron] 2020-11-24 10:55:38: Started GET /api/v1/repos//redmine.mito-team.com/issues/5521 for 80.249.94.216
[Macaron] 2020-11-24 10:55:38: Completed GET /api/v1/repos//redmine.mito-team.com/issues/5521 404 Not Found in 2.885575ms
[Macaron] 2020-11-24 10:55:38: Started GET /avatars/cd7557caccb37e9d67895c074f82c925 for 80.249.94.216
[Macaron] 2020-11-24 10:55:38: Completed GET /avatars/cd7557caccb37e9d67895c074f82c925 200 OK in 1.223238ms
[Macaron] 2020-11-24 10:55:38: Started GET /user/events for 80.249.94.216
[Macaron] 2020-11-24 10:55:38: Started GET /manifest.json for 80.249.94.216
[Macaron] 2020-11-24 10:55:38: Completed GET /manifest.json 200 OK in 3.100573ms
[Macaron] 2020-11-24 10:55:38: Started GET /serviceworker.js for 80.249.94.216
[Macaron] [Static] Serving /serviceworker.js
[Macaron] 2020-11-24 10:55:38: Completed GET /serviceworker.js 304 Not Modified in 767.286µs
[Macaron] 2020-11-24 10:55:39: Started GET /serviceworker.js for 80.249.94.216
[Macaron] [Static] Serving /serviceworker.js
[Macaron] 2020-11-24 10:55:39: Completed GET /serviceworker.js 304 Not Modified in 865.289µs
[Macaron] 2020-11-24 10:55:42: Started POST /fst/tws/pull/284/target_branch for 80.249.94.216
[Macaron] 2020-11-24 10:56:00: Started GET /fst/tws.git/info/refs?service=git-upload-pack for 80.249.94.216
[Macaron] 2020-11-24 10:56:00: Completed GET /fst/tws.git/info/refs?service=git-upload-pack 401 Unauthorized in 181.748213ms
[Macaron] 2020-11-24 10:56:00: Started GET /fst/tws.git/info/refs?service=git-upload-pack for 80.249.94.216
[Macaron] 2020-11-24 10:56:02: Completed GET /fst/tws.git/info/refs?service=git-upload-pack 200 OK in 1.524401452s
[Macaron] 2020-11-24 10:56:02: Started GET /mitoteam/a2m.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:02: Completed GET /mitoteam/a2m.git/info/refs?service=git-upload-pack 401 Unauthorized in 81.09537ms
[Macaron] 2020-11-24 10:56:02: Started GET /mitoteam/a2m.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:03: Completed GET /mitoteam/a2m.git/info/refs?service=git-upload-pack 200 OK in 1.513681382s
[Macaron] 2020-11-24 10:56:04: Started GET /mitoteam/checklistdynamics.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:04: Completed GET /mitoteam/checklistdynamics.git/info/refs?service=git-upload-pack 401 Unauthorized in 101.091536ms
[Macaron] 2020-11-24 10:56:04: Started GET /mitoteam/checklistdynamics.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:05: Completed GET /mitoteam/checklistdynamics.git/info/refs?service=git-upload-pack 200 OK in 1.48288532s
[Macaron] 2020-11-24 10:56:06: Started GET /mitoteam/mt-config.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:06: Completed GET /mitoteam/mt-config.git/info/refs?service=git-upload-pack 401 Unauthorized in 116.617878ms
[Macaron] 2020-11-24 10:56:06: Started GET /mitoteam/mt-config.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:07: Completed GET /mitoteam/mt-config.git/info/refs?service=git-upload-pack 404 Not Found in 1.234722716s
[Macaron] 2020-11-24 10:56:07: Started GET /fst/tws.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:07: Completed GET /fst/tws.git/info/refs?service=git-upload-pack 401 Unauthorized in 81.028345ms
[Macaron] 2020-11-24 10:56:07: Started GET /fst/tws.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:09: Completed GET /fst/tws.git/info/refs?service=git-upload-pack 200 OK in 1.533652122s
[Macaron] 2020-11-24 10:56:09: Started GET /mitoteam/velobynet.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:09: Completed GET /mitoteam/velobynet.git/info/refs?service=git-upload-pack 401 Unauthorized in 80.984888ms
[Macaron] 2020-11-24 10:56:09: Started GET /mitoteam/velobynet.git/info/refs?service=git-upload-pack for 46.101.160.106
[Macaron] 2020-11-24 10:56:10: Completed GET /mitoteam/velobynet.git/info/refs?service=git-upload-pack 200 OK in 1.452159587s
^C[Macaron] 2020-11-24 10:56:46: Completed GET /user/events 200 OK in 1m8.281888686s
[Macaron] 2020-11-24 10:56:46: Completed GET /user/events 200 OK in 1m12.057936251s

Thank you!
@melmus melmus mentioned this issue Dec 25, 2020
Closed
6 tasks
@lunny lunny added the type/bug label Jan 14, 2021
@lunny
Copy link
Member

lunny commented Jan 26, 2021

Could you confirm that is this still a problem?

@lunny lunny mentioned this issue Jan 26, 2021
Closed
6 tasks
@f1mishutka
Copy link
Author

Could you confirm that is this still a problem?

Yes

Just checked it with Gitea 1.13.1 and nothing has changed, bug is still there.

@6543
Copy link
Member

6543 commented Jan 26, 2021 •
edited

@f1mishutka do you mean base ore head branch? Video show head-branch

Can you give us the stack trace of the 500 issue?
you most likely have to make error logging more verbose: https://docs.gitea.io/en-us/logging-configuration/

@parnic-sks
Copy link

We are seeing this on our repo as well. I got setup to compile and run gitea myself and it looks like we get stuck (or at least spend a lot of time) in func (c *Commit) HasPreviousCommit() since it recursively calls HasPreviousCommit for each of a commit's parents. VSCode shows tens of thousands of calls to
git.exe -c credential.helper= -c protocol.version=2 -c filter.lfs.required= -c filter.lfs.smudge= -c filter.lfs.clean= cat-file --batch

Instead of recursively checking all parents, could this function be replaced with a single call to git merge-base --is-ancestor or is it more complicated than that?

@zeripath
Copy link
Contributor

zeripath commented Feb 7, 2021

@parnic-sks OMG HasPreviousCommit is terrible! I'm sorry I missed that!

PR incoming

zeripath added a commit to zeripath/gitea that referenced this issue Feb 7, 2021
@zeripath
HasPreviousCommit causes recursive load of commits unnecessarily
a1f07de 
This PR improves HasPreviousCommit to prevent the automatic and recursive loading
of previous commits using git merge-base --is-ancestor and git rev-list

Related go-gitea#13684

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Feb 7, 2021
Merged
@zeripath
Copy link
Contributor

zeripath commented Feb 7, 2021

hmm... actually I suspect that this may be the cause of the problems on 1.13 too so maybe I should just replace the function entirely even for the go-git variant.

zeripath added a commit that referenced this issue Feb 10, 2021
@zeripath
HasPreviousCommit causes recursive load of commits unnecessarily (#14598
f9abf94 
)

This PR improves HasPreviousCommit to prevent the automatic and recursive loading
of previous commits using git merge-base --is-ancestor and git rev-list

Fix #13684

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this issue Feb 11, 2021
@zeripath
HasPreviousCommit causes recursive load of commits unnecessarily (go-…
daef4ab 
…gitea#14598)

Backport go-gitea#14598

This PR improves HasPreviousCommit to prevent the automatic and recursive loading
of previous commits using git merge-base --is-ancestor and git rev-list

Fix go-gitea#13684

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Feb 11, 2021
Merged
lafriks pushed a commit that referenced this issue Feb 14, 2021
@zeripath @6543
HasPreviousCommit causes recursive load of commits unnecessarily (#14598
d3200db 
) (#14649)

This PR improves HasPreviousCommit to prevent the automatic and recursive loading
of previous commits using git merge-base --is-ancestor and git rev-list

Fix #13684

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
@f1mishutka
Copy link
Author

Confirmed: v1.13.3 fixed this issue.

Thank you!

@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

HasPreviousCommit causes recursive load of commits unnecessarily zeripath/gitea
5 participants
@lunny @zeripath @f1mishutka @6543 @parnic-sks