From c2817d081700d1fe14d92c51c4e89551182e7fb6 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 20 Feb 2024 12:20:13 +0000 Subject: 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 --- src/sub_commands/list.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/sub_commands') 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( .find(|e| e.id.to_string().eq(&event_id_to_search)) { res.push(event.clone()); + if event_is_patch_set_root(event) { + break; + } event_id_to_search = get_event_parent_id(event).unwrap_or_default(); } Ok(res) -- cgit v1.2.3