Skip to content

Commit

Permalink
fixup faster merge
Browse files Browse the repository at this point in the history
  • Loading branch information
samoht committed May 17, 2019
1 parent 84a1e5d commit 566d757
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/irmin-pack/irmin_pack.ml
Expand Up @@ -531,7 +531,7 @@ module Index (H : Irmin.Hash.S) = struct
in
let rec go last_read l =
get_index_entry last_read >>= function
| None -> Lwt_list.iter_p (fun (_, e) -> append_entry tmp e) l
| None -> Lwt_list.iter_s (fun (_, e) -> append_entry tmp e) l
| Some e -> (
match l with
| (k, v) :: t ->
Expand All @@ -543,7 +543,7 @@ module Index (H : Irmin.Hash.S) = struct
else append_entry tmp v >|= fun () -> (Some e, t) )
>>= fun (last, rst) ->
if !offset >= IO.offset index && last = None then
Lwt_list.iter_p (fun (_, e) -> append_entry tmp e) rst
Lwt_list.iter_s (fun (_, e) -> append_entry tmp e) rst
else go last rst
| [] ->
append_entry tmp e >>= fun () ->
Expand Down

0 comments on commit 566d757

Please sign in to comment.