forge/forge
11
8
Fork 8
Code Issues 96 Pull requests 1 Projects Wiki Activity Actions

Wildly inaccurate diff for imported PR #631

New issue
Closed
opened 2026-06-25 15:12:24 +00:00 by mikem · 4 comments
mikem commented 2026-06-25 15:12:24 +00:00
Copy link

Summary

An imported PR shows a wildly inaccurate diff and commit list

Details

I'm not sure how widespread this is, but I ran across this case.

koji/koji#4546/files

This PR was

  • imported from pagure
  • merged post-import via forgejo ui (worked around forge/forge#540 by pushing the branch to to the main repo)

Is this perhaps fallout from the solution to forge/forge#556 ?

### Summary An imported PR shows a wildly inaccurate diff and commit list ### Details I'm not sure how widespread this is, but I ran across this case. https://forge.fedoraproject.org/koji/koji/pulls/4546/files This PR was - imported from pagure - merged post-import via forgejo ui (worked around forge/forge#540 by pushing the branch to to the main repo) Is this perhaps fallout from the solution to forge/forge#556 ?
mikem commented 2026-06-25 15:16:23 +00:00
Author
Copy link

The page claims the PR contains 40 commits changing 45 files, but the actual changes were only 5 commits changing 3 files.

*   8ef46e28e Merge pull request 'rpmdiff: fix ignore behavior' (#4546) from rpmdiff-fixes into master
|\  
| * 5895940a3 (origin/rpmdiff-fixes, rpmdiff-fixes) update index mapping to align with rpmlint
| * a73343fea fix old tests
| * 3d2cdca66 new unit tests for rpmdiff
| * 7ad862d78 fix FILEIDX values
| * 58f16dd5e fix kojihash
|/
The page claims the PR contains 40 commits changing 45 files, but the actual changes were only 5 commits changing 3 files. ``` * 8ef46e28e Merge pull request 'rpmdiff: fix ignore behavior' (#4546) from rpmdiff-fixes into master |\ | * 5895940a3 (origin/rpmdiff-fixes, rpmdiff-fixes) update index mapping to align with rpmlint | * a73343fea fix old tests | * 3d2cdca66 new unit tests for rpmdiff | * 7ad862d78 fix FILEIDX values | * 58f16dd5e fix kojihash |/ ```
pasted_image_260625.png
49 KiB
pasted_image_260625.png
mikem commented 2026-06-25 15:28:26 +00:00
Author
Copy link

Ok, I think what happened is that the fix for forge/forge#556 reset the merge_base to the original value from pagure, even though we'd already updated and merged this one. The merge_base value for this PR was reset to what pagure had.

Ok, I think what happened is that the fix for forge/forge#556 reset the merge_base to the original value from pagure, even though we'd already updated and merged this one. The merge_base value for this PR was reset to what pagure had.
mikem commented 2026-06-25 15:37:53 +00:00
Author
Copy link

Another case -- koji/koji!4542

Another case -- koji/koji!4542
ryanlerch added this to the Sprint 26 project 2026-07-27 09:40:41 +00:00
ryanlerch commented 2026-07-29 10:21:37 +00:00
Owner
Copy link

@mikem — your analysis was correct. The merge_base for these two PRs was set to a stale value, causing the diff to show far more commits and changed files than the PR actually contained.

I investigated and confirmed that only these two PRs in koji/koji were affected:

To check for other affected PRs, I:

  • Searched all merged PRs in koji/koji for the same incorrect merge_base value — only these two matched
  • Cross-referenced non-release branches in the repo against merged PRs to find any others that may have been merged via the #540 workaround (pushing the branch to the main repo) — no additional cases found

The merge_base has been corrected for both PRs. The diffs and commit lists should now display accurately.

@mikem — your analysis was correct. The `merge_base` for these two PRs was set to a stale value, causing the diff to show far more commits and changed files than the PR actually contained. I investigated and confirmed that only these two PRs in koji/koji were affected: - **koji/koji#4546** (rpmdiff: fix ignore behavior) — was showing 40 commits / 45 files, should be 5 commits / 3 files - https://forge.fedoraproject.org/koji/koji/pulls/4546/files - **koji/koji#4542** (Rpmdiff doesn't correctly check hashes) — should be 1 commit - https://forge.fedoraproject.org/koji/koji/pulls/4542/files To check for other affected PRs, I: - Searched all merged PRs in koji/koji for the same incorrect `merge_base` value — only these two matched - Cross-referenced non-release branches in the repo against merged PRs to find any others that may have been merged via the #540 workaround (pushing the branch to the main repo) — no additional cases found The `merge_base` has been corrected for both PRs. The diffs and commit lists should now display accurately.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
test
docs
No results found.
Labels
Clear labels   
ai-review-please
label for requesting AI code review

  
Org/Team Modification

   
Private Issues
Label for tracking development on Private Issues in Forgejo

  
Runner Request
  
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 can be worked on immediately when capacity is available.

  
chore
Work that needs to be done but doesn't add new functionality or fix bugs. Maintenance tasks that keep the system running smoothly and the codebase clean.

  
documentation
Work focused on creating, updating, or improving documentation for users, developers, or system administrators.

  
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 and should be broken down.

  
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
 Work items that cannot progress due to external dependencies, blockers, or issues that need resolution.

  
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
 Work items currently being worked on by a team member. Active development, research, or implementation is happening.

  
Sprint Status
Review
 Work items that are complete but need review, testing, or approval before being marked as done.

  
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 addresses shortcuts, workarounds, or suboptimal implementations that were done previously to meet deadlines. These items improve code quality, maintainability, or performance without adding new features.

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

  
Work Item
Epic
 Large initiatives that are broken down into multiple smaller work items (user stories, tasks, bugs). Epics represent significant features or projects that span multiple sprints.

  
Work Item
Spike
 Time-boxed research, investigation, or proof-of-concept work to reduce uncertainty or explore solutions. Spikes help inform future development decisions.

  
Work Item
Task
 Used to break down larger user stories into smaller, manageable implementation pieces. They focus on the specific technical steps needed to deliver the user story's value.

  
Work Item
User Story
 User-facing features or functionality that can be framed from a user perspective, describing what someone wants to accomplish and why.

No labels
ai-review-please
Org/Team Modification
Private Issues
Runner Request
Backlog Status
Needs Review
Backlog Status
Ready
chore
documentation
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 26
Assignees
Clear assignees
No assignees
ryanlerch
2 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#631
No description provided.