github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-15 20:09:18 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

manually merge PR by fast-forward crashes gitea #811

New Issue
Closed
opened 2025-11-02 03:37:32 -06:00 by GiteaMirror · 5 comments
GiteaMirror commented 2025-11-02 03:37:32 -06:00
Owner
Copy Link

Originally created by @grissiom on GitHub (Jun 13, 2017).

  • Gitea version (or commit ref): 1.1.2
  • Git version: 2.11
  • Operating system: Windows
  • 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:
    Sorry that the log is on the working machine which could not access the Internet easily,

Description

https://github.com/go-gitea/gitea/blob/v1.1.2/models/pull.go#L520 assume the mergeCommit is not empty. But if the PR is merged manually by fast-forward, git rev-list --ancestry-path --merges ... will give empty output. So mergeCommit[:40] will crash the program by index out of range error.

I hope I've provided enough information. If you need the full log etc., please tell me and I will try to get more.

Originally created by @grissiom on GitHub (Jun 13, 2017). - Gitea version (or commit ref): 1.1.2 - Git version: 2.11 - Operating system: Windows - Database (use `[x]`): - [ ] PostgreSQL - [ ] MySQL - [ ] MSSQL - [x] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [ ] No - [x] Not relevant - Log gist: Sorry that the log is on the working machine which could not access the Internet easily, ## Description https://github.com/go-gitea/gitea/blob/v1.1.2/models/pull.go#L520 assume the `mergeCommit` is not empty. But if the PR is merged manually by fast-forward, `git rev-list --ancestry-path --merges ...` will give empty output. So `mergeCommit[:40]` will crash the program by index out of range error. I hope I've provided enough information. If you need the full log etc., please tell me and I will try to get more.
GiteaMirror added the type/bug label 2025-11-02 03:37:32 -06:00
GiteaMirror commented 2025-11-02 03:37:32 -06:00
Author
Owner
Copy Link

@ethantkoenig commented on GitHub (Jun 13, 2017):

The out-of-index error seems to have been fixed since v1.1.2 (#1420)

@ethantkoenig commented on GitHub (Jun 13, 2017): The out-of-index error seems to have been fixed since v1.1.2 (#1420)
GiteaMirror commented 2025-11-02 03:37:33 -06:00
Author
Owner
Copy Link

@grissiom commented on GitHub (Jun 13, 2017):

That commit treat the empty mergeCommit as errors. So how do you deal with fast-forward "merge"?

@grissiom commented on GitHub (Jun 13, 2017): That commit treat the empty `mergeCommit` as errors. So how do you deal with fast-forward "merge"?
GiteaMirror commented 2025-11-02 03:37:33 -06:00
Author
Owner
Copy Link

@ethantkoenig commented on GitHub (Dec 10, 2017):

This issue should be closed, it was fixed by #1989.

@ethantkoenig commented on GitHub (Dec 10, 2017): This issue should be closed, it was fixed by #1989.
GiteaMirror commented 2025-11-02 03:37:33 -06:00
Author
Owner
Copy Link

@lunny commented on GitHub (Dec 10, 2017):

@grissiom please feel free to reopen it.

@lunny commented on GitHub (Dec 10, 2017): @grissiom please feel free to reopen it.
GiteaMirror commented 2025-11-02 03:37:33 -06:00
Author
Owner
Copy Link

@grissiom commented on GitHub (Dec 19, 2017):

Yes, I found it was fixed. Thanks for you all!

@grissiom commented on GitHub (Dec 19, 2017): Yes, I found it was fixed. Thanks for you all!
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#811
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?