diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-08 14:50:26 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-08 14:50:26 +0100 |
| commit | 918a3d99aa84727b0bf84d83cc6b0125b3c301cd (patch) | |
| tree | b819e9d4530a7b1702c4b258f7eb25c8a8fa7ced | |
| parent | f6371595b514a962078bd58254df5cda939706bf (diff) | |
fix(remote): `push` proposal use correct thread
in the event of a proposal revisions
| -rw-r--r-- | src/git_remote_helper.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/git_remote_helper.rs b/src/git_remote_helper.rs index f679f20..f36b23b 100644 --- a/src/git_remote_helper.rs +++ b/src/git_remote_helper.rs | |||
| @@ -671,10 +671,11 @@ async fn push( | |||
| 671 | .concat() | 671 | .concat() |
| 672 | .contains(&user_ref.public_key) | 672 | .contains(&user_ref.public_key) |
| 673 | { | 673 | { |
| 674 | let thread_id = if patches.len().eq(&1) { | 674 | let thread_id = if let Ok(root_event_id) = get_event_root(tip_patch) { |
| 675 | tip_patch.id() | 675 | root_event_id |
| 676 | } else { | 676 | } else { |
| 677 | get_event_root(tip_patch)? | 677 | // tip patch is the root proposal |
| 678 | tip_patch.id() | ||
| 678 | }; | 679 | }; |
| 679 | let mut parent_patch = tip_patch.clone(); | 680 | let mut parent_patch = tip_patch.clone(); |
| 680 | ahead.reverse(); | 681 | ahead.reverse(); |