Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix replication of head text when head matches index (#24306)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: cole-miller <m@cole-miller.net>
This commit is contained in:
Max Brunsfeld 2025-02-05 12:37:32 -08:00 • committed by GitHub
parent 59738f88c2
commit b710945949
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 126 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/project/src/buffer_store.rs
View file

@ -131,7 +131,7 @@ impl BufferChangeSetState {
let diff_bases_change = match mode {
Mode::HeadOnly => DiffBasesChange::SetHead(message.committed_text),
Mode::IndexOnly => DiffBasesChange::SetIndex(message.staged_text),
Mode::IndexMatchesHead => DiffBasesChange::SetBoth(message.staged_text),
Mode::IndexMatchesHead => DiffBasesChange::SetBoth(message.committed_text),
Mode::IndexAndHead => DiffBasesChange::SetEach {
index: message.staged_text,
head: message.committed_text,
@ -402,7 +402,7 @@ impl RemoteBufferStore {
.await?;
let mode = Mode::from_i32(response.mode).ok_or_else(|| anyhow!("Invalid mode"))?;
let bases = match mode {
Mode::IndexMatchesHead => DiffBasesChange::SetBoth(response.staged_text),
Mode::IndexMatchesHead => DiffBasesChange::SetBoth(response.committed_text),
Mode::IndexAndHead => DiffBasesChange::SetEach {
head: response.committed_text,
index: response.staged_text,
@ -896,7 +896,7 @@ impl LocalBufferStore {
let diff_bases_change =
match (needs_staged_text, needs_committed_text) {
(true, true) => Some(if staged_text == committed_text {
DiffBasesChange::SetBoth(staged_text)
DiffBasesChange::SetBoth(committed_text)
} else {
DiffBasesChange::SetEach {
index: staged_text,
@ -944,7 +944,7 @@ impl LocalBufferStore {
(index, head, Mode::IndexAndHead)
}
DiffBasesChange::SetBoth(text) => {
(text, None, Mode::IndexMatchesHead)
(None, text, Mode::IndexMatchesHead)
}
};
let message = proto::UpdateDiffBases {