Merge Pull Request 500 error

[xlouc]

• Gitea version (or commit ref): 1.9.0-rc2
• Git version: 1.8.3.1
• Operating system: CentOS 7
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes (provide example URL)
  • No
  • Not relevant
• Log gist:

2019/07/27 03:17:19 ...ters/private/hook.go:74:HookPreReceive() [E] Unable to detect force push between: 50c1b4fd7cba3172b4b0a72386708cf5a66a55eb and 8f9a3d87fbee0a03a94230aebd4b3c5fffd09b24 in 824741413200:yakcode/yak-ui Error: exit status 128 - fatal: Not a git repository (or any of the parent directories): .git

2019/07/27 03:17:19 routers/repo/pull.go:629:MergePullRequest() [E] Merge: git push: From /home/git/gitea/repositories/yakcode/yak-ui
         * [new branch]      develop    -> head_repo/develop
         * [new branch]      gh-pages   -> head_repo/gh-pages
         * [new branch]      master     -> head_repo/master
        Automatic merge went well; stopped before committing as requested
        remote: Gitea: Internal Server Error
        remote: Fail to detect force push: exit status 128 - fatal: Not a git repository (or any of the parent directories): .git
        remote:
        To /home/git/gitea/repositories/yakcode/yak-ui.git
         ! [remote rejected] master -> master (pre-receive hook declined)
        error: failed to push some refs to '/home/git/gitea/repositories/yakcode/yak-ui.git'

Description

...

Screenshots

[xlouc]

Errors occur only when branch protection is set

[zeripath]

Hi! thanks for your report. I'm suspicious that this is a duplicate of #7611, which has been fixed in master with #7615 and 1.9 with #7618.

[lunny]

The git version 1.8.3.1 is too low. Maybe it's related.

[lafriks]

I think this is duplicate of #7754

[lunny]

It should be.

[axeloz]

Hello, I'm using Gitea 1.9.0 and I have the exact same issue.
Trying to merge a pull request from "develop" to "master". Master branch is protected but I'm into the whitelist for merges.

Error message:

2019/08/08 14:15:15 routers/repo/pull.go:629:MergePullRequest() [E] Merge: git push: From /home/git/repositories/xxxxxxxxx/webservices
         * branch            develop    -> FETCH_HEAD
         * [new branch]      develop    -> head_repo/develop
        Automatic merge went well; stopped before committing as requested
        remote: Gitea: Internal Server Error
        remote: Fail to detect force push: exit status 128 - fatal: Not a git repository (or any of the parent directories): .git
        remote:
        To /home/git/repositories/xxxxxxxxx/webservices.git
         ! [remote rejected] master -> master (pre-receive hook declined)
        error: failed to push some refs to '/home/git/repositories/xxxxxxxxx/webservices.git'

Thanks

[lunny]

See #7754 and #7775

[axeloz]

thanks @lunny, so we must wait for the #7775 fix to be merged if I understand right

[joseluisq]

I'm facing the same issue for latest Gitea v1.10.0+dev-232-gf1c414882 with Postgres.
Waiting for #7775.

[lucastucious]

Same issue with gitea v1.11.1

[zeripath]

@lucastucious it will not be the same issue.

Please update to 1.12 and open a new issue with logs and more detail