Fix bug when comparing there is diff but no commit #36460
Draft
+86
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/go
wxiaoguang
reviewed
Jan 27, 2026
lafriks
approved these changes
Jan 27, 2026
GiteaBot
added
lgtm/need 1
wxiaoguang
reviewed
Jan 27, 2026
wxiaoguang
reviewed
Jan 27, 2026
wxiaoguang
reviewed
Jan 27, 2026
wxiaoguang
reviewed
Jan 27, 2026
templates/repo/diff/compare.tmpl
Outdated
| <div class="ui container fluid padded tw-my-4"> | ||
| {{template "repo/commits_table" .}} | ||
| {{template "repo/diff/box" .}} | ||
| {{if .CommitCount}} |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where the compare button in the PR timeline would incorrectly show "These branches are equal" when a commit is dropped via force push, even though there is actually a diff to display.
Changes:
- Renamed
IsNothingToComparetoDiffNotAvailableto better reflect the semantic meaning - Updated template logic to show the diff section when either commits exist OR a diff is available (not just when commits exist)
- Added comprehensive integration test to validate the fix for the force push scenario
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
routers/web/repo/compare.go |
Sets both CommitCount=0 and DiffNotAvailable=true when comparing identical commits; maintains existing logic for determining when diff is unavailable |
routers/web/repo/pull.go |
Renames IsNothingToCompare to DiffNotAvailable for consistency |
templates/repo/diff/compare.tmpl |
Updates conditional logic to show diff section when commits exist OR diff is available, and conditionally displays commits table and diff box separately |
templates/repo/commits_table.tmpl |
Updates variable reference from IsNothingToCompare to DiffNotAvailable |
tests/integration/pull_compare_test.go |
Adds test that reproduces the bug by creating a PR, force-pushing to drop a commit, and verifying the compare link shows the diff |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
wxiaoguang
reviewed
Jan 29, 2026
|
|
||
| if compareInfo.HeadCommitID == compareInfo.MergeBase { | ||
| ctx.Data["IsNothingToCompare"] = true | ||
| ctx.Data["DiffNotAvailable"] = true |
wxiaoguang
reviewed
Jan 29, 2026
| <div class="ui container fluid padded tw-my-4"> | ||
| {{template "repo/commits_table" .}} | ||
| {{template "repo/diff/box" .}} | ||
| {{if $hasCommits}} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #36390
Sometimes the compare will include diff but not commit.