Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/staged/src-tauri/src/git/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ fn clone_lock_for_repo(github_repo: &str) -> Arc<Mutex<()>> {
/// Fetch the latest from origin and reset the main checkout's working tree to
/// the remote default branch tip.
///
/// This ensures the files on disk in the bare/main clone reflect the latest
/// This ensures the files on disk in the main clone reflect the latest
/// upstream state — critical for action detection which reads files from the
/// working tree. Worktrees are separate directories and are **not** affected
/// by this reset.
Expand Down
13 changes: 6 additions & 7 deletions apps/staged/src-tauri/src/web_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,14 +311,13 @@ async fn handle_ws(mut socket: WebSocket, state: WebAppState) {
}
// Handle incoming messages (ping/pong, close)
msg = socket.recv() => {
match msg {
let pong_data = match msg {
Some(Ok(Message::Close(_))) | None => break,
Some(Ok(Message::Ping(data))) => {
if socket.send(Message::Pong(data)).await.is_err() {
break;
}
}
_ => {}
Some(Ok(Message::Ping(data))) => data,
_ => continue,
};
if socket.send(Message::Pong(pong_data)).await.is_err() {
break;
}
}
}
Expand Down