forked from
anil.recoil.org/monopam
Monorepo management for opam overlays
Revert force-push on local checkouts; require explicit --force
After filter-repo all commit hashes change (even for unrelated
subtrees), so checkouts become stale. This is expected — use
monopam push --force to update them.
Don't auto-force-push: it masks real issues and surprises users.
+1
-4
+1
-4
lib/push.ml
+1
-4
lib/push.ml
···
128
128
let* () =
129
129
Git_cli.clean_untracked ~proc ~fs:(fs :> _ Eio.Path.t) checkout_dir
130
130
in
131
-
(* Force-push when we just cloned the checkout: the remote's history
132
-
and the monorepo's subtree history are independent lineages, so a
133
-
normal push will always be non-fast-forward. *)
134
131
split_and_push ~proc ~fs ~monorepo ~git_repo ~prefix ~checkout_url
135
-
~clean ~force:(force || freshly_cloned) ~branch
132
+
~clean ~force ~branch
136
133
|> Result.map (fun () -> Pushed)
137
134
end
138
135
end