Skip to content

Fix git graph file diff view opening wrong file if a previous one is already open - #55595

Merged
ChristopherBiscardi merged 2 commits into
zed-industries:mainfrom
jakenorris1124:git_ui/commit-diff-open-proper-file
May 6, 2026
Merged

Fix git graph file diff view opening wrong file if a previous one is already open#55595
ChristopherBiscardi merged 2 commits into
zed-industries:mainfrom
jakenorris1124:git_ui/commit-diff-open-proper-file

Conversation

@jakenorris1124

@jakenorris1124 jakenorris1124 commented May 4, 2026

Copy link
Copy Markdown
Contributor

Fixed the portion of the open() function of the CommitView struct that checked to see if the commit view was already open in a tab. Previously, it did not account for files being filtered, and called pane.activate_item() when it found a matching commit SHA open. Now, the pane item is deleted and replaced with the new CommitView, respecting the position of the tab. This allows for the filtered files to be updated and work according to the expectations laid out in the mentioned issue.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Closes #55446

Release Notes:

  • Fix git graph file diff view opening wrong file if a previous one is already open

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 4, 2026
@SomeoneToIgnore SomeoneToIgnore added area:integrations/git Git integration feedback area:integrations/git/git graph Feedback for Zed's git graph support labels May 4, 2026
@ChristopherBiscardi ChristopherBiscardi self-assigned this May 6, 2026

@ChristopherBiscardi ChristopherBiscardi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the relevant bug. The workflow does feel a bit awkward and has some interesting behaviors, such as git-graph buffers only opening in the same pane if they are in the same tab-group... but that is all pre-existing behavior and this PR nicely only fixes the bug related to the wrong file opening without modifying those workflows.

@ChristopherBiscardi
ChristopherBiscardi added this pull request to the merge queue May 6, 2026
Merged via the queue into zed-industries:main with commit 11f0ca5 May 6, 2026
31 checks passed
ebaah46 pushed a commit to ebaah46/zed that referenced this pull request May 6, 2026
…already open (zed-industries#55595)

Fixed the portion of the open() function of the CommitView struct that
checked to see if the commit view was already open in a tab. Previously,
it did not account for files being filtered, and called
pane.activate_item() when it found a matching commit SHA open. Now, the
pane item is deleted and replaced with the new CommitView, respecting
the position of the tab. This allows for the filtered files to be
updated and work according to the expectations laid out in the mentioned
issue.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes zed-industries#55446

Release Notes:

- Fix git graph file diff view opening wrong file if a previous one is
already open

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
@jakenorris1124
jakenorris1124 deleted the git_ui/commit-diff-open-proper-file branch May 6, 2026 19:33
@jakenorris1124

Copy link
Copy Markdown
Contributor Author

I was unaware of it only working in the same tab-group, so I am glad my changes didn't end up introducing that as a problem. As for the awkward workflow, I was hoping to change it for the better, but being new to contributing here, I wasn't sure the best way to do it. Either way, thanks for checking in and I'm glad it worked out!

jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
…already open (zed-industries#55595)

Fixed the portion of the open() function of the CommitView struct that
checked to see if the commit view was already open in a tab. Previously,
it did not account for files being filtered, and called
pane.activate_item() when it found a matching commit SHA open. Now, the
pane item is deleted and replaced with the new CommitView, respecting
the position of the tab. This allows for the filtered files to be
updated and work according to the expectations laid out in the mentioned
issue.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes zed-industries#55446

Release Notes:

- Fix git graph file diff view opening wrong file if a previous one is
already open

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
…already open (zed-industries#55595)

Fixed the portion of the open() function of the CommitView struct that
checked to see if the commit view was already open in a tab. Previously,
it did not account for files being filtered, and called
pane.activate_item() when it found a matching commit SHA open. Now, the
pane item is deleted and replaced with the new CommitView, respecting
the position of the tab. This allows for the filtered files to be
updated and work according to the expectations laid out in the mentioned
issue.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes zed-industries#55446

Release Notes:

- Fix git graph file diff view opening wrong file if a previous one is
already open

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:integrations/git/git graph Feedback for Zed's git graph support area:integrations/git Git integration feedback cla-signed The user has signed the Contributor License Agreement

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

Clicking files in git graph opens wrong file when a historic file tab is already open

3 participants