github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-12 02:24:21 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Branch/commit ref mixup in PRs with weird side effects #4764

New Issue
Open
opened 2025-11-02 06:02:11 -06:00 by GiteaMirror · 10 comments
GiteaMirror commented 2025-11-02 06:02:11 -06:00
Owner
Copy Link

Originally created by @ashimokawa on GitHub (Jan 31, 2020).

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

Description

I merged this PR by rebasing :
https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1785

(there was a duplicate message, that two people closed the PR, but that's probably unrelated)

Then there was

https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1788

which was all of a sudden pointing to the commit from 1785 mentioned above.
You can still see the effect now when following the link to 1788, it points to the same commit "merged in ...." like 1785 which is wrong (but the branch mentioned at the top is correct). It also says that the guy who opened 1785 closed 1788 which is - wrong. Both PRs where by different people and completely unrelated. Scary....

Any idea?

Originally created by @ashimokawa on GitHub (Jan 31, 2020). - Gitea version (or commit ref): 1.11-rc2 - Git version: 2.20.1 - Operating system: Debian 10 - Database (use `[x]`): - [ ] PostgreSQL - [x] MySQL - [ ] MSSQL - [ ] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [X] No (hard to reproduce) - [ ] Not relevant - Log gist: ## Description I merged this PR by rebasing : https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1785 (there was a duplicate message, that two people closed the PR, but that's probably unrelated) Then there was https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1788 which was all of a sudden pointing to the commit from 1785 mentioned above. You can still see the effect now when following the link to 1788, it points to the same commit "merged in ...." like 1785 which is wrong (but the branch mentioned at the top is correct). It also says that the guy who opened 1785 closed 1788 which is - wrong. Both PRs where by different people and completely unrelated. Scary.... Any idea?
GiteaMirror added the issue/criticaltype/bug labels 2025-11-02 06:02:11 -06:00
GiteaMirror commented 2025-11-02 06:02:12 -06:00
Author
Owner
Copy Link

@ashimokawa commented on GitHub (Jan 31, 2020):

This might be describing two different issues, but similar to
https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1785
(where two people seemingly merged)

In the following issue:
https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1782
An organization(!) is mentioned as the closing person. In addition to my username.
All I did is pressing the merge and rebase button. At that time codeberg.org was running gitea 1.10, the mixup I describe happened while running 1.11.

In any case, the effect that branches got mixed up in PRs is the main concern in this issue.
And I wonder if this would also have happened if I chose merge (without rebase). All the PRs.

Is there anything I could lookup in the database regarding the mixed up PRs (1785 and 1788) to help debugging the issue?

@ashimokawa commented on GitHub (Jan 31, 2020): This might be describing two different issues, but similar to https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1785 (where two people seemingly merged) In the following issue: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/1782 An organization(!) is mentioned as the closing person. In addition to my username. All I did is pressing the merge and rebase button. At that time codeberg.org was running gitea 1.10, the mixup I describe happened while running 1.11. In any case, the effect that branches got mixed up in PRs is the main concern in this issue. And I wonder if this would also have happened if I chose merge (without rebase). All the PRs. Is there anything I could lookup in the database regarding the mixed up PRs (1785 and 1788) to help debugging the issue?
GiteaMirror commented 2025-11-02 06:02:12 -06:00
Author
Owner
Copy Link

@lunny commented on GitHub (Feb 1, 2020):

When deleting a branch it will try to close the pull request. It should check if the pull request has been merged or closed.

@lunny commented on GitHub (Feb 1, 2020): When deleting a branch it will try to close the pull request. It should check if the pull request has been merged or closed.
GiteaMirror commented 2025-11-02 06:02:12 -06:00
Author
Owner
Copy Link

@ashimokawa commented on GitHub (Feb 1, 2020):

@lunny
Branches have been deleted after merging the PRs. Deletion of branches did not trigger this.
The messed PR seem to have pointed to the wrong commit ref out of nowhere.

@TaaviE
What was the fist effect you saw when you realized your PR was broken? Did you delete your branch before that?

@ashimokawa commented on GitHub (Feb 1, 2020): @lunny Branches have been deleted after merging the PRs. Deletion of branches did not trigger this. The messed PR seem to have pointed to the wrong commit ref out of nowhere. @TaaviE What was the fist effect you saw when you realized your PR was broken? Did you delete your branch before that?
GiteaMirror commented 2025-11-02 06:02:12 -06:00
Author
Owner
Copy Link

@TaaviE commented on GitHub (Feb 1, 2020):

I didn't delete my branch, just pushed a commit to replace the existing one in the PR.

@TaaviE commented on GitHub (Feb 1, 2020): I didn't delete my branch, just pushed a commit to replace the existing one in the PR.
GiteaMirror commented 2025-11-02 06:02:13 -06:00
Author
Owner
Copy Link

@ashimokawa commented on GitHub (Feb 1, 2020):

@TaaviE
So you force pushed to the branch with the PR, and then it got mixed up with the other PR?

@lunny
@lafriks
Cound that be a problem? Force pushing to a PR branch?

@ashimokawa commented on GitHub (Feb 1, 2020): @TaaviE So you force pushed to the branch with the PR, and then it got mixed up with the other PR? @lunny @lafriks Cound that be a problem? Force pushing to a PR branch?
GiteaMirror commented 2025-11-02 06:02:13 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Feb 1, 2020):

yup force pushing to a PR branch making it align with the base branch would cause gitea to think it has been merged. (Yeah that sounds odd but if you want to allow merging of PRs by hand that's how you do it - well not quite - but that's how unkwon did it...)

@zeripath commented on GitHub (Feb 1, 2020): yup force pushing to a PR branch making it align with the base branch would cause gitea to think it has been merged. (Yeah that sounds odd but if you want to allow merging of PRs by hand that's how you do it - well not quite - but that's how unkwon did it...)
GiteaMirror commented 2025-11-02 06:02:13 -06:00
Author
Owner
Copy Link

@TaaviE commented on GitHub (Feb 1, 2020):

Wouldn't it make sense not to claim the PR has been merged? Rather claim
it's closed and by being equal to master, a system message. Currently it
rather confusingly just sent e-mails of people doing things they haven't. I
personally would get a heart attack, thinking my account got somehow
compromised.

@TaaviE commented on GitHub (Feb 1, 2020): Wouldn't it make sense not to claim the PR has been merged? Rather claim it's closed and by being equal to master, a system message. Currently it rather confusingly just sent e-mails of people doing things they haven't. I personally would get a heart attack, thinking my account got somehow compromised.
GiteaMirror commented 2025-11-02 06:02:13 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Feb 1, 2020):

Yes. It would. I have an idea for how to do this properly but I haven't had a chance to do it.

@zeripath commented on GitHub (Feb 1, 2020): Yes. It would. I have an idea for how to do this properly but I haven't had a chance to do it.
GiteaMirror commented 2025-11-02 06:02:13 -06:00
Author
Owner
Copy Link

@ashimokawa commented on GitHub (Feb 1, 2020):

@zeripath
But not only that the PR got set to merged - it is completely messed up/mixed up with another PR.
Also mpst PRs that I regularly rebase+merged via the GUI got a double close from two different users (one even from an organzation), that's completely scary.

@ashimokawa commented on GitHub (Feb 1, 2020): @zeripath But not only that the PR got set to merged - it is completely messed up/mixed up with another PR. Also mpst PRs that I regularly rebase+merged via the GUI got a double close from two different users (one even from an organzation), that's completely scary.
GiteaMirror commented 2025-11-02 06:02:14 -06:00
Author
Owner
Copy Link

@vanger-pro commented on GitHub (Feb 7, 2020):

If you click commit, with an existing PR, the PR indicates that the branch was deleted. (This pull request cannot be reopened because the branch was deleted.) Although the branch currently exists.

@vanger-pro commented on GitHub (Feb 7, 2020): If you click commit, with an existing PR, the PR indicates that the branch was deleted. (This pull request cannot be reopened because the branch was deleted.) Although the branch currently exists.
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 issue/critical 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#4764
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?