gogs: Invalid symmetric difference expression
- Gogs version (or commit ref): 0.11.33.1119
- Git version: 2.1.4
- Operating system: Debian
- Database (use
[x]):- PostgreSQL
- MySQL
- MSSQL
- SQLite
- Can you reproduce the bug at https://try.gogs.io:
- Yes (provide example URL)
- No
- Not relevant
- Log gist (usually found in
log/gogs.log):
fatal: Invalid symmetric difference expression dd76f78ac9dbd547e0145fa906d4aae6d1f03b18...741e4b90e6a0f216aee057fbeb7fb9ba11390c00
Description
After updating to the latest version, pull requests can no longer be merged in. The web interface gives a 500 and this error:
"An error has occurred : exit status 128 - fatal: Invalid symmetric difference expression dd76f78ac9dbd547e0145fa906d4aae6d1f03b18...741e4b90e6a0f216aee057fbeb7fb9ba11390c00"
From the command line, a manual git diff shows the same:
# git diff dd76f78ac9dbd547e0145fa906d4aae6d1f03b18...741e4b90e6a0f216aee057fbeb7fb9ba11390c00
fatal: Invalid symmetric difference expression dd76f78ac9dbd547e0145fa906d4aae6d1f03b18...741e4b90e6a0f216aee057fbeb7fb9ba11390c00
About this issue
- Original URL
- State: closed
- Created 7 years ago
- Comments: 16 (9 by maintainers)
Commits related to this issue
- pull_request: fix changes not pushed to upstream if between two repositories (#4890) — committed to gogs/gogs by unknwon 7 years ago
- allow api to create tags for releases (#4890) — committed to unfoldingWord/dcs by Bobonium 6 years ago
OK it is a regression, fix has been pushed to
master.Just a note:
For PRs between different repositories, the changes were NOT pushed to base repository, also, changes were NOT lost, your data is safe! Those changes just merged to the base branch of original repository (fork repository).
For example, if a PR is between
user1/branch1anduser2/branch2, the changes were made touser2/branch1.Since this problem is critical, I’ll made a quick release today.
@KevinJue I don’t think the issue you encounter relates to the OP. I remember there is an issue already reported this issue, that rebase succeed but no commits merged to base branch.
Thank you @Unknwon! I was about to create a ticket for that issue, but the great community of gogs already did!
Well done!
Yes, I reproduced!