forge/forge
11
8
Fork 7
Code Issues 88 Pull requests Projects 3 Wiki Activity Actions

Incorrect commit display for some PRs #556

New issue
Closed
opened 2026-05-05 14:43:27 +00:00 by mikem · 12 comments
mikem commented 2026-05-05 14:43:27 +00:00
Copy link

Summary

For some merged pull requests, the Forgejo web ui fails to show all the commits

Details

The koji repo was recently migrated to forgejo. I'm starting to notice that some PRs do not display correctly. Here is one recent example -- koji/koji#4538/commits

This merged pull request merged four separate commits, but commits tab only shows one of them.

pasted_image_260505-002

Otoh, the commit graph does show them.

pasted_image_260505-004

### Summary For some merged pull requests, the Forgejo web ui fails to show all the commits ### Details The koji repo was recently migrated to forgejo. I'm starting to notice that some PRs do not display correctly. Here is one recent example -- https://forge.fedoraproject.org/koji/koji/pulls/4538/commits This merged pull request merged four separate commits, but commits tab only shows one of them. ![pasted_image_260505-002](/attachments/3830ebf7-2739-4885-9b22-187c9c74416f) Otoh, the commit graph does show them. ![pasted_image_260505-004](/attachments/69afad09-9b34-4507-ba6e-a92ab59b5f74)
pasted_image_260505-004.png
63 KiB
pasted_image_260505-002.png
50 KiB
mikem commented 2026-05-05 14:45:05 +00:00
Author
Copy link

This is an imported PR, so possibly this is a problem from the import?

Dunno if this could be related to forge/forge#540

This is an imported PR, so possibly this is a problem from the import? Dunno if this could be related to forge/forge#540
mikem commented 2026-05-05 14:46:20 +00:00
Author
Copy link

Another recent example - koji/koji#4543/commits

I haven't exhaustively checked, but these were easy to find, so I'm guessing there are lots.

Another recent example - https://forge.fedoraproject.org/koji/koji/pulls/4543/commits I haven't exhaustively checked, but these were easy to find, so I'm guessing there are lots.
mikem commented 2026-05-05 14:47:34 +00:00
Author
Copy link

Note that the diff tab is also wrong

Note that the diff tab is also wrong
t0xic0der added this to the Sprint 20 project 2026-05-06 03:41:28 +00:00
t0xic0der commented 2026-05-06 08:29:40 +00:00
Member
Copy link

I have worked on a fix for this. Thankfully, that did not require me to make changes to the existing testcases.

I am unable to make pull requests on Codeberg at the moment but I will link it here once I have created one.

I have worked on a fix for this. Thankfully, that did not require me to make changes to the existing testcases. I am unable to make pull requests on Codeberg at the moment but I will link it here once I have created one.
t0xic0der commented 2026-05-06 08:36:10 +00:00
Member
Copy link

Here's the pull request https://codeberg.org/forgejo/forgejo/pulls/12433

Now we sit tight

Here's the pull request https://codeberg.org/forgejo/forgejo/pulls/12433 Now we sit tight
mikem commented 2026-05-06 19:14:22 +00:00
Author
Copy link

Am I correct in thinking that this fix will fix future imports, but not existing ones?

Am I correct in thinking that this fix will fix future imports, but not existing ones?
t0xic0der commented 2026-05-08 04:45:56 +00:00
Member
Copy link

Yeah, this is unfortunately not a retroactive fix.

But feel free to reimport things if the contextual background is crucial.

The pull request was merged and backported.

I will keep this open until we are sure that the changes made it to Fedora Forge.

Yeah, this is unfortunately not a retroactive fix. But feel free to reimport things if the contextual background is crucial. The pull request was [merged](https://codeberg.org/forgejo/forgejo/pulls/12433) and [backported](https://codeberg.org/forgejo/forgejo/pulls/12467). I will keep this open until we are sure that the changes made it to Fedora Forge.
t0xic0der commented 2026-05-11 02:43:27 +00:00
Member
Copy link

@lenkaseg thank you for incorporating the fix into our v15 deployment.

Once that gets out of the magic hat, @mikem give it another try please?

@lenkaseg thank you for incorporating the fix into our v15 deployment. Once that gets out of the magic hat, @mikem give it another try please?
mikem commented 2026-05-12 19:28:41 +00:00
Author
Copy link

For some of my repos, I could probably do a re-import. In any case, I can certainly run a test to verify. How do I know when it's actually deployed?

Unfortunately with the Koji repo, the situation is complicated. The new forgejo koji repo has already diverged quite a bit from the original paguer. There are numerous comments, issues, pull requests, and merges. We can't simply re-import here, or we'll lose that recent history. Is there any chance that we could manage to fix our existing MRs in place, perhaps with a client script?

For some of my repos, I could probably do a re-import. In any case, I can certainly run a test to verify. How do I know when it's actually deployed? Unfortunately with the Koji repo, the situation is complicated. The new forgejo koji repo has already diverged quite a bit from the original paguer. There are numerous comments, issues, pull requests, and merges. We can't simply re-import here, or we'll lose that recent history. Is there any chance that we could manage to fix our existing MRs in place, perhaps with a client script?
humaton modified the project from Sprint 20 to Sprint 21 2026-05-18 10:16:08 +00:00
t0xic0der commented 2026-05-19 02:18:56 +00:00
Member
Copy link

@mikem see #570. Once the v15.x makes it to the production, this would be worked upon to retroactively resolve the commit histories of the migrated across pull requests. Until then, we are blocked on the v15.x deployment on the production environment.

@mikem see https://forge.fedoraproject.org/forge/forge/issues/570. Once the v15.x makes it to the production, this would be worked upon to retroactively resolve the commit histories of the migrated across pull requests. Until then, we are blocked on the v15.x deployment on the production environment.
ryanlerch commented 2026-06-01 06:23:00 +00:00
Owner
Copy link

It is deployed now.

@mikem i also have the serverside fix in place now too, will run it on koji and the other repos in the koji org too.

It is deployed now. @mikem i also have the serverside fix in place now too, will run it on koji and the other repos in the koji org too.
ryanlerch commented 2026-06-01 07:01:37 +00:00
Owner
Copy link

have run the repair tool on the following repos:

  • koji
  • mbs-web-ui
  • ursa-major
  • mbs
  • koji-tools
have run the repair tool on the following repos: * koji * mbs-web-ui * ursa-major * mbs * koji-tools
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
test
docs
No results found.
Labels
Clear labels   
Backlog Status
Needs Review
 Work items that have been created or updated but need review, refinement, or approval before they can be considered ready for sprint planning.

  
Backlog Status
Ready
 Work items that have been reviewed, refined, and are ready to be committed to a sprint. These items have clear requirements and could be worked on immediately when capacity is available.

  
Chore
Tasks that are necessary but don't directly deliver new value to the end-user. These are internal tasks like updating a library, managing user accounts, or setting up a new service.

  
points
01
 A task that is simple, small, and has very little uncertainty. It should be easy enough for any team member to pick up and complete quickly, without a lot of discussion or research.

  
points
02
 This is a task that is slightly more complex or larger than a "1." It might involve two or three simple steps, but the outcome is still very clear and there's little uncertainty.

  
points
03
 medium-sized task with some noticeable complexity. It might require a bit more thought or collaboration. The steps are well-defined, but it's not a trivial change.

  
points
05
 a significant piece of work. It has more complexity and a higher degree of uncertainty than smaller tasks. It might require some research, a design discussion, or collaboration across multiple teams.

  
points
08
 complex task with a lot of uncertainty. It's often the largest size that a team will consider for a single sprint. It likely requires a detailed breakdown and multiple team members to complete.

  
points
13
 Any task that feels like it's a "13" or more is considered an Epic. These are too large and uncertain to be worked on in a single sprint.

  
Priority
High
 This is for work that is critical and needs to be addressed in the next sprint. It's often for urgent bugs, important features, or a major piece of technical debt that is blocking other work.

  
Priority
Low
 This is for work that is good to do but not urgent. It's a candidate for being worked on when there's extra time or when it rises in importance. It can stay in the backlog for a longer period.

  
Priority
Medium
 This is for important work that should be done soon, but isn't as urgent as a high-priority item. It will likely be considered for the next 1-2 sprints.

  
Sprint Status
Blocked
 Indicates the work cannot proceed. There is a dependency or an issue that is preventing the team from completing the task. This is a flag for the Scrum Master to help unblock the team.

  
Sprint Status
Done
 Work items that have been completed, reviewed, and integrated. No further work is needed within the current sprint.

  
Sprint Status
In Progress
 This label is for work that a developer is actively working on. This is usually what you'll see on the "In Progress" column of your project board.

  
Sprint Status
Review
 This indicates that the work is complete, but it is now in a review state. This could mean a peer code review, a QA check, or a review by the Product Owner.

  
Sprint Status
To Do
 Work items that are committed to the sprint but haven't been started yet. These items are ready to be picked up by team members.

  
Technical Debt
work that improves the codebase without adding new features. It's work that pays down the "debt" you've accumulated, such as refactoring a messy piece of code, improving test coverage.

  
Work Item
Bug
 Issues where the system is not working as intended or designed. Bugs represent deviations from expected behavior.

  
Work Item
Epic

  
Work Item
Spike

  
Work Item
Task

  
Work Item
User Story

No labels
Backlog Status
Needs Review
Backlog Status
Ready
Chore
points
01
points
02
points
03
points
05
points
08
points
13
Priority
High
Priority
Low
Priority
Medium
Sprint Status
Blocked
Sprint Status
Done
Sprint Status
In Progress
Sprint Status
Review
Sprint Status
To Do
Technical Debt
Work Item
Bug
Work Item
Epic
Work Item
Spike
Work Item
Task
Work Item
User Story
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Sprint 21
Assignees
Clear assignees
No assignees
t0xic0der
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
forge/forge#556
No description provided.