Skip to content

tui fix diff #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metta-alpha wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tui fix diff #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions code-rs/tui/src/get_git_diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ pub(crate) async fn get_git_diff() -> io::Result<(bool, String)> {
}

// Run tracked diff and untracked file listing in parallel.
// Force-disable ANSI color escapes so the TUI diff renderer can apply its own
// styling without leaking raw escape sequences into the buffer.
let (tracked_diff_res, untracked_output_res) = tokio::join!(
run_git_capture_diff(&["diff", "--color"]),
run_git_capture_diff(&["diff", "--no-color"]),
run_git_capture_stdout(&["ls-files", "--others", "--exclude-standard"]),
);
let tracked_diff = tracked_diff_res?;
Expand All @@ -45,7 +47,7 @@ pub(crate) async fn get_git_diff() -> io::Result<(bool, String)> {
let null_path = null_path.clone();
let file = file.to_string();
join_set.spawn(async move {
let args = ["diff", "--color", "--no-index", "--", &null_path, &file];
let args = ["diff", "--no-color", "--no-index", "--", &null_path, &file];
run_git_capture_diff(&args).await
});
}
Expand Down