From 44e1f35aba7b646e746eb7533e804b4f1b607def Mon Sep 17 00:00:00 2001 From: Mark Elvers Date: Tue, 23 Jul 2024 11:34:36 +0100 Subject: [PATCH 1/2] Run git fetch before checkout --- src-opam/opam.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src-opam/opam.ml b/src-opam/opam.ml index 7b80766..95e4125 100644 --- a/src-opam/opam.ml +++ b/src-opam/opam.ml @@ -37,9 +37,10 @@ let install_opam_from_source ?(add_default_link = true) ?(prefix = "/usr/local") ~hash () = run "cd /tmp/opam-sources && cp -P -R -p . ../opam-build-%s && cd \ - ../opam-build-%s && git checkout %s && ln -s ../opam/src_ext/archives \ - src_ext/archives && env PATH=\"/tmp/opam/bootstrap/ocaml/bin:$PATH\" \ - ./configure --enable-cold-check%s%s && env \ + ../opam-build-%s && git fetch && git checkout %s && ln -s \ + ../opam/src_ext/archives src_ext/archives && env \ + PATH=\"/tmp/opam/bootstrap/ocaml/bin:$PATH\" ./configure \ + --enable-cold-check%s%s && env \ PATH=\"/tmp/opam/bootstrap/ocaml/bin:$PATH\" make lib-ext all && mkdir -p \ %s/bin && cp /tmp/opam-build-%s/opam %s/bin/opam-%s && chmod a+x \ %s/bin/opam-%s && rm -rf /tmp/opam-build-%s" From 34d005f5fb2cef376b5fb3357d33ec8910a6e857 Mon Sep 17 00:00:00 2001 From: Mark Elvers Date: Wed, 31 Jul 2024 15:41:41 +0100 Subject: [PATCH 2/2] Make git fetch quiet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Antonin Décimo --- src-opam/opam.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-opam/opam.ml b/src-opam/opam.ml index 95e4125..ea88d50 100644 --- a/src-opam/opam.ml +++ b/src-opam/opam.ml @@ -37,7 +37,7 @@ let install_opam_from_source ?(add_default_link = true) ?(prefix = "/usr/local") ~hash () = run "cd /tmp/opam-sources && cp -P -R -p . ../opam-build-%s && cd \ - ../opam-build-%s && git fetch && git checkout %s && ln -s \ + ../opam-build-%s && git fetch -q && git checkout %s && ln -s \ ../opam/src_ext/archives src_ext/archives && env \ PATH=\"/tmp/opam/bootstrap/ocaml/bin:$PATH\" ./configure \ --enable-cold-check%s%s && env \