feat: complete git system in source control panel#48
Merged
jmaxdev merged 2 commits intoTrixtyAI:mainfrom Apr 19, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Completes the built-in Source Control panel’s Git feature set by adding common remote, history, stash, branch, and file-diff operations, plus backend Tauri commands to execute them safely.
Changes:
- Added new Tauri invoke typings + UI wiring for pull/fetch, merge, reset/revert, stash, per-file diff viewing, discard, and commit amend.
- Implemented history/stash sections with localized relative-time labels and new confirmation prompts/toasts.
- Extended the Rust Tauri backend with the required
git_*commands and push “set upstream” fallback.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 7 comments.
| File | Description |
|---|---|
| apps/desktop/src/api/tauri.ts | Adds TS types and command map entries for new Git Tauri commands (log/stash/diff/etc.) and git_commit amend option. |
| apps/desktop/src/api/builtin.l10n.ts | Adds EN/ES translations for the new Git UI actions, confirmations, sections, and relative time units. |
| apps/desktop/src/addons/builtin.git-explorer/GitExplorerComponent.tsx | Implements the expanded Git UI (pull/fetch, merge, stash, history actions, diff modal, conflict banner, polling guard). |
| apps/desktop/src-tauri/src/lib.rs | Adds/updates Rust Tauri commands to run Git operations (pull/fetch/log/merge/reset/revert/stash/restore/file diff) and push upstream fallback logic. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- git_revert / git_reset: reject empty or leading '-' args (option injection) - get_git_file_diff: return stderr on non-zero exit - handleDiscard: wrap in setGitLoading for polling guard consistency - stash entries: render localized pop/apply labels - commit options toggle: localized aria-label, aria-haspopup/expanded, disabled with commit button conditions - l10n ES: fix "Resolvelos" -> "Resuélvelos"
jmaxdev
force-pushed
the
feat/git-system
branch
from
96482b3 to
5ea5ec4
Compare
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.
Chages
Branches
+to create branches viagit switch -c.git merge --no-edit.Remote
--set-upstream origin <branch>on the first push of a new branch.Commit
History
reset --soft,reset --mixed(confirmed),reset --hard(confirmed), revert (confirmed).Stash
Files
+/-/@@lines.git restore) an unstaged change, with confirmation.Polish / hardening
get_git_branchespayload so a non-array shape no longer crashes the panel (branches.map is not a function).validate_branch_name).Out of scope (can be separate issues if needed):
git rev-parse --short HEAD— the explicit label covers the case.Issues