Repository navigation
diff: the pane reads the diff again after a rebase that finished - #98374
Merged
Merged
Conversation
|
Checked this against #94847, which opens the pane on the first edit only once a fetch lists a file ( With #94847 alone, the leftover They merge cleanly, and the merged diff suite passes 188/188 on 2.1.285. Test for all four cases, with the git steps: gist. |
poteat
enabled auto-merge (squash)
September 30, 2026 19:15
stevenpetryk
approved these changes
Sep 30, 2026
konsta95
added a commit
to konsta95/claude-code
that referenced
this pull request
Sep 30, 2026
poteat's rebase detection: REBASE_HEAD counts as a rebase only beside a rebase-merge directory, or a rebase-apply one holding `rebasing`. It merges without conflicts and brings main up to 732e167. Co-authored with a harness running Claude and Codex teams. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> Claude-Session: 16cb7844-98c6-4af7-b67a-3e9d16705e7f
konsta95
added a commit
to konsta95/claude-code
that referenced
this pull request
Sep 30, 2026
main now has poteat's anthropics#98374, anthropics#98445 and anthropics#98357 as squash commits (9778ad7, 292c5b8, 525d3b3). Its mods/ is identical to 732e167 with the three PR heads merged, which this bundle has already merged from the heads. The six files that conflict keep the bundle's text from the first parent, so mods/ is unchanged by this merge. CHANGELOG.md and feed.xml come from main. Co-authored with a harness running Claude and Codex teams. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> Claude-Session: 16cb7844-98c6-4af7-b67a-3e9d16705e7f
This was referenced Sep 30, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
A file git leaves behind a finished rebase no longer reads as a rebase under way.
Notes
REBASE_HEADafter a rebase that stopped on a conflict in its last commit and was then continued or skipped (seen on git 2.43 and 2.50). The pane read that file alone as a rebase under way, so every read failed and the pane said "Diff unavailable" until the file went, which could be hours.REBASE_HEADas the commit "at which the operation is currently stopped" during a rebase (gitrevisions). By what git does when run: with that file alonegit statusreports nothing to commit, and it reports a rebase while the folderrebase-mergeorrebase-applyis there.REBASE_HEADis there beside one of a rebase's folders:rebase-merge, orrebase-applyholdingrebasing, which is how that folder differs from the one a stoppedgit amkeeps.git am, a rebase paused at abreakor at a failedexec. A merge, a cherry-pick and a revert under way read as before; none of them was seen to leave its file behind.Test Plan
claude plugin test mods/diffpassesgit rebase --continue; start a session there, change a file,/diff: the pane shows the diff/diff: the pane reads "Diff unavailable"git amon a conflict and open/diff: the pane shows the diff, as beforeChangelog