Skip to content

Pull requests stuck in "Merge conflict checking is in progress. Try again in few moments" #22578

Open
@tautf

Description

@tautf

Description

After the update to 1.18.2 all our pull requests are stuck with above error message. I did restart the server multiple times already, we cannot get out of this view.

This was not happening with 1.17.4 and 1.18.0.
I upgraded from 1.18.0 to 1.18.2 and skipped 1.18.1, could that cause the issue?

Problem got worse with 1.18.0 that it became slower but it at least resolved after 10-15 minutes. Now we are stuck for multiple hours.

I am using the gogit variant but it looks like the windows side git is used or am i wrong?

Not sure if the logs are related to it but thats the only errors i could find. I have disabled my anti-virus but the issue still persists.

Gitea Version

1.18.2

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

2023/01/23 11:27:40 ...dules/git/command.go:215:Run() [D] [63ce6116] D:\Gitea\Repositories\heat-coat\app.git: C:\Program Files\Git\cmd\git.exe -c protocol.version=2 -c credential.helper= -c filter.lfs.required= -c filter.lfs.smudge= -c filter.lfs.clean= read-tree 96e2301d33d85e9f0953291304fac69e34ea7e30
2023/01/23 11:27:40 ...dules/git/command.go:215:Run() [D] [63ce6116] D:\Gitea\Repositories\heat-coat\app.git: C:\Program Files\Git\cmd\git.exe -c protocol.version=2 -c credential.helper= -c filter.lfs.required= -c filter.lfs.smudge= -c filter.lfs.clean= check-attr --stdin -z --cached linguist-vendored linguist-generated linguist-language gitlab-language --
2023/01/23 11:27:40 ...dules/git/command.go:215:Run() [D] [63ce6116] D:\Gitea\Repositories\heat-coat\app.git: C:\Program Files\Git\cmd\git.exe -c protocol.version=2 -c credential.helper= -c filter.lfs.required= -c filter.lfs.smudge= -c filter.lfs.clean= diff --shortstat 18c2448519b2d4fd1fc2e2970614931bfc68ebe3...96e2301d33d85e9f0953291304fac69e34ea7e30
2023/01/23 11:27:40 ...it/repo_attribute.go:408:func2() [E] [63ce6116] Unable to open checker for 96e2301d33d85e9f0953291304fac69e34ea7e30. Error: failed to run attr-check. Error: exit status 1

Screenshots

No response

Git Version

2.39.1

Operating System

Windows Server 2019

How are you running Gitea?

Windows Service

Database

PostgreSQL

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions