-
-
Notifications
You must be signed in to change notification settings - Fork 6k
Closed
Description
- Gitea version (or commit ref): 339d7de
- Git version:
- Operating system:
- 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:
#gitea.log
# when merge, I guess repo_id should not be 0
2017/09/28 07:23:24 [.../runtime/asm_amd64.s:2337 goexit()] [E] GetIssueByID: issue does not exist [id: 91, repo_id: 0, index: 0]
#id 616475e8dac... is the commit id of merged commit
2017/09/28 07:23:24 [...routers/repo/pull.go:431 MergePullRequest()] [E] CommitsBetweenIDs: object does not exist [id: 616475e8dacc4aecce8cd2d03e772bbda1112cbb, rel_path: ]
$ cat xorm.log | grep "UPDATE \`pull"
2017/09/28 07:23:24 [I] [SQL] UPDATE `pull_request` SET `has_merged` = ? WHERE `id`=? []interface {}{true, 69}
#gitea.log
# go back pull request and view file
# /pulls/{id}/commits
2017/09/28 09:00:20 [...routers/repo/pull.go:282 ViewPullCommits()] [E] Repo.GitRepo.GetCommit: exit status 128 - fatal: ambiguous argument '': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
# /pulls/{id}/files
2017/09/28 09:00:22 [...routers/repo/pull.go:382 ViewPullFiles()] [E] GetDiffRange: exit status 128 - fatal: ambiguous argument '': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
DB record after merge
id |type |status |issue_id |index |head_repo_id |base_repo_id |head_user_name |head_branch |base_branch |merge_base |has_merged |merged_commit_id |merger_id |merged_unix |
---|-----|-------|---------|------|-------------|-------------|---------------|-----------------|-------------------|-----------------|-----------|-----------------|----------|-------------|
69 |0 |2 |91 |1 |34 |32 |xxxxxxx |change_startpage |AndroidTV |9801873676134c.. |1 | |0 |0 |