diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-20 12:20:13 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-20 12:20:13 +0000 |
| commit | c2817d081700d1fe14d92c51c4e89551182e7fb6 (patch) | |
| tree | f82dfe07f7a7f5bd2f95b8e45d2aeaf443ef1ba4 | |
| parent | 570ad62875c191c6bb7809e936a64938eb0fb310 (diff) | |
fix(pull): applying proposal revisions
if a revision responds to a root patch (no cover letter)
then the revision will nolonger be applied on top of
the first patch in the original set
| -rw-r--r-- | src/sub_commands/list.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs index 9d02eb1..008872b 100644 --- a/src/sub_commands/list.rs +++ b/src/sub_commands/list.rs | |||
| @@ -720,6 +720,9 @@ pub fn get_most_recent_patch_with_ancestors( | |||
| 720 | .find(|e| e.id.to_string().eq(&event_id_to_search)) | 720 | .find(|e| e.id.to_string().eq(&event_id_to_search)) |
| 721 | { | 721 | { |
| 722 | res.push(event.clone()); | 722 | res.push(event.clone()); |
| 723 | if event_is_patch_set_root(event) { | ||
| 724 | break; | ||
| 725 | } | ||
| 723 | event_id_to_search = get_event_parent_id(event).unwrap_or_default(); | 726 | event_id_to_search = get_event_parent_id(event).unwrap_or_default(); |
| 724 | } | 727 | } |
| 725 | Ok(res) | 728 | Ok(res) |