Skip to content

git_ui: Add staged and unstaged change views - #109

Merged
shenghsi merged 1 commit into
mainfrom
feature/git-staged-unstaged-multibuffers
Jul 27, 2026
Merged

git_ui: Add staged and unstaged change views#109
shenghsi merged 1 commit into
mainfrom
feature/git-staged-unstaged-multibuffers

Conversation

@shenghsi

Copy link
Copy Markdown
Owner

Summary

  • add separate staged and unstaged project-diff views
  • keep staged diffs refreshed from HEAD to the index while preserving selections
  • expose actions from the Git panel and entry context menus
  • cover partial staging, deletion, rename, refresh, reuse, and repository switching

Upstream adaptation

Selectively reimplements the fork-compatible behavior from zed-industries/zed#46541 without importing its collaboration and broad buffer-diff refactors.

Validation

  • cargo test -p git_ui --lib -- --test-threads=1 (119 passed)
  • cargo test -p git_ui project_diff::tests::test_staged -- --test-threads=1 (4 passed)
  • cargo fmt --all -- --check
  • ./script/clippy
  • fresh /tmp/Flint-Local.app bundle verified with codesign

Release Notes:

  • Added separate staged and unstaged change views.

@shenghsi
shenghsi merged commit 146c938 into main Jul 27, 2026
4 of 5 checks passed
@shenghsi
shenghsi deleted the feature/git-staged-unstaged-multibuffers branch July 30, 2026 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant