My aggregated monorepo of OCaml code, automaintained
Squashed 'monopam/' changes from 369891e8..a9b9b636
a9b9b636 Fix sync not picking up external pushes on first run
git-subtree-dir: monopam
git-subtree-split: a9b9b636953e1eb0d43771c9e55debc443a02af5
+14
-1
+14
-1
lib/monopam.ml
+14
-1
lib/monopam.ml
···
1778
1778
end
1779
1779
else begin
1780
1780
(* OPTIMIZATION: skip packages already in sync *)
1781
-
let to_pull, to_skip = List.partition needs_pull successfully_fetched in
1781
+
(* But always pull repos that received commits from fetch *)
1782
+
let repos_updated_by_fetch =
1783
+
List.filter_map
1784
+
(fun (name, was_cloned, commits) ->
1785
+
if was_cloned || commits > 0 then Some name else None)
1786
+
fetch_successes
1787
+
in
1788
+
let needs_pull_after_fetch pkg =
1789
+
needs_pull pkg
1790
+
|| List.mem (Package.repo_name pkg) repos_updated_by_fetch
1791
+
in
1792
+
let to_pull, to_skip =
1793
+
List.partition needs_pull_after_fetch successfully_fetched
1794
+
in
1782
1795
Log.app (fun m -> m " Updating subtrees...");
1783
1796
if to_skip <> [] then
1784
1797
Log.app (fun m ->